From c25722650406f98349a30f1a28a72a782c975998 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Tue, 21 Dec 2021 19:37:22 -0500 Subject: [PATCH] Revert "farmOS 7.x-1.8." This reverts commit bd17406a5bee0965a63b781dccfda4b7a737dbe7. --- build-farm.make | 8 ++++---- docker/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-farm.make b/build-farm.make index b7a45bce8..0a10832be 100644 --- a/build-farm.make +++ b/build-farm.make @@ -12,7 +12,7 @@ includes[] = drupal-org-core.make ; ----------------------------------------------------------------------------- projects[farm][type] = profile -projects[farm][version] = 1.8 -;projects[farm][download][type] = git -;projects[farm][download][url] = http://git.drupal.org/project/farm.git -;projects[farm][download][branch] = 7.x-1.x +;projects[farm][version] = 1.8 +projects[farm][download][type] = git +projects[farm][download][url] = http://git.drupal.org/project/farm.git +projects[farm][download][branch] = 7.x-1.x diff --git a/docker/Dockerfile b/docker/Dockerfile index 8d1942a1f..5f9f74efa 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,8 +2,8 @@ FROM drupal:7 # Set the farmOS version to download. -ARG FARMOS_VERSION=7.x-1.8 -#ARG FARMOS_VERSION=7.x-1.x-dev +#ARG FARMOS_VERSION=7.x-1.8 +ARG FARMOS_VERSION=7.x-1.x-dev # Install the BCMath PHP extension. RUN docker-php-ext-install bcmath