Merge branch 'release/8.9.1'

govCMS · Jul 27, 2020 · c5cbac9 · c5cbac9
2 parents a1daaa8 + b80f7a7
commit c5cbac9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,6 +22,10 @@ jobs:
  - run:
  name: Build project
  command: |
+ if [ ! -z ${GITHUB_TOKEN} ]; then
+ echo "GITHUB_TOKEN=$GITHUB_TOKEN">>.env
+ export $(grep -v '^#' .env | xargs)
+ fi
  ahoy -v build
  docker-compose exec test dockerize -wait tcp://mariadb:3306 -timeout 1m
  - run:

diff --git a/.docker/Dockerfile.govcms8 b/.docker/Dockerfile.govcms8
@@ -6,6 +6,7 @@ FROM amazeeio/php:${PHP_IMAGE_VERSION}-cli-drupal-${LAGOON_IMAGE_VERSION} as bui
 ARG GOVCMS_PROJECT_VERSION
 ARG DRUPAL_CORE_VERSION
 ARG COMPOSER_AUTH
+ARG GITHUB_TOKEN
 
 COPY composer.* /app/
 
@@ -15,6 +16,7 @@ RUN sed -i -e "/govcms\/govcms/ s!\^1.0!${GOVCMS_PROJECT_VERSION}!" /app/compose
 COPY scripts/composer/ScriptHandler.php /app/scripts/composer/ScriptHandler.php
 
 ENV COMPOSER_MEMORY_LIMIT=-1
+RUN composer config -g github-oauth.github.com ${GITHUB_TOKEN}
 RUN composer install -d /app \
 # Force drupal-scaffold to run to ensure that the needed files are always created, even if a composer.lock is provided
  && composer drupal-scaffold \

diff --git a/.docker/images/php/00-govcms.ini b/.docker/images/php/00-govcms.ini
@@ -1,3 +1,5 @@
 [PHP]
 
+session.gc_maxlifetime=1440
+session.cookie_lifetime=0
 upload_max_filesize=256M
diff --git a/.env.default b/.env.default
@@ -43,9 +43,9 @@ SITE_AUDIT_VERSION=7.x-3.x
 # Set the version of GovCMS and Drupal Core to use - you can use a tag or branch reference (1.x-dev) here
 # Note: the DRUPAL_CORE_VERSION here must match the version required in the corresponding GOVCMS_PROJECT_VERSION
 # See https://github.com/govCMS/govcms8/releases
-GOVCMS_PROJECT_VERSION=1.5.0
-DRUPAL_CORE_VERSION=8.8.8
+GOVCMS_PROJECT_VERSION=1.6.1
+DRUPAL_CORE_VERSION=8.9.1
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. v1.2.0)
 # See https://github.com/amazeeio/lagoon/releases
-LAGOON_IMAGE_VERSION=v1.6.0
+LAGOON_IMAGE_VERSION=v1.8.1
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
  "webflo/drupal-finder": "^1.0.0",
  "webmozart/path-util": "^2.3",
  "drupal/core-recommended": "^8.8",
- "symfony/event-dispatcher": "4.3.11 as 3.4.35",
+ "symfony/event-dispatcher": "4.3.11 as 3.4.41",
  "zaporylie/composer-drupal-optimizations": "^1.0",
  "govcms/scaffold-tooling": "^2.0"
  },

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,6 +26,7 @@ services:
  LAGOON_IMAGE_VERSION: ${LAGOON_IMAGE_VERSION:-latest}
  PHP_IMAGE_VERSION: ${PHP_IMAGE_VERSION:-7.3}
  COMPOSER_AUTH: ${COMPOSER_AUTH:-}
+ GITHUB_TOKEN: ${GITHUB_TOKEN:-}
  image: ${DOCKERHUB_NAMESPACE:-govcms8lagoon}/govcms8
  << : *default-volumes
  environment: