Merge branch 'release/7.9.1'

.circleci/config.yml

@@ -10,12 +10,11 @@ jobs:
  steps:
  - checkout
  - run:
- name: Docker-compose validate
+ name: Validate docker-compose configuration
  command: docker-compose config -q
  - run:
  name: Update codebase to follow CI configuration
- command: |
- cp .env.default .env
+ command: cp .env.default .env
  - setup_remote_docker
  - run:
  name: Start amazeeio-network
@@ -36,9 +35,8 @@ jobs:
  command: |
  ahoy drush st
  ahoy drush pml
- -
- run:
- name: Test redis is functional
+ - run:
+ name: Test that Redis is functional
  command: |
  # Set ENABLE_REDIS env var and warm cache with a bootstrap
  docker-compose exec -T --env ENABLE_REDIS=true cli drush status
@@ -60,9 +58,8 @@ jobs:
  else
  echo "Skipping deployment"
  fi
- -
- run:
- name: Test nginx configuration
+ - run:
+ name: Test Nginx configuration
  command: |
  docker-compose exec nginx nginx -t
  composer install -d .docker/images/nginx/tests

.docker/Dockerfile.govcms8

@@ -9,8 +9,7 @@ ARG DRUPAL_CORE_VERSION
 COPY composer.* /app/
 
 RUN sed -i -e "/govcms\/govcms/ s!\^1.0!${GOVCMS_PROJECT_VERSION}!" /app/composer.json \
- && sed -i -e "/drupal\/core/ s!\^8.7!${DRUPAL_CORE_VERSION}!" /app/composer.json \
- && sed -i -e "/webflo\/drupal-core-strict/ s!\^8.7!${DRUPAL_CORE_VERSION}!" /app/composer.json
+ && sed -i -e "/drupal\/core-recommended/ s!\^8.8!${DRUPAL_CORE_VERSION}!" /app/composer.json
 
 COPY scripts/composer/ScriptHandler.php /app/scripts/composer/ScriptHandler.php
 

.docker/images/govcms8/scripts/govcms-deploy

@@ -44,6 +44,7 @@ if [[ "$LAGOON_ENVIRONMENT_TYPE" != "production" ]]; then
  if ! drush status --fields=bootstrap | grep -q "Successful"; then
  # Import prod db in Lagoon development environments.
  if [[ ! -z "$LAGOON_ENVIRONMENT_TYPE" && "$LAGOON_ENVIRONMENT_TYPE" != "local" ]]; then
+ drush sql-drop -y
  drush sql-sync @govcms.prod @self -y
  common_deploy
  else
@@ -53,6 +54,7 @@ if [[ "$LAGOON_ENVIRONMENT_TYPE" != "production" ]]; then
  # @see comments for GOVCMS_TEST_CANARY above.
  if [[ "$GOVCMS_TEST_CANARY" = TRUE ]]; then
  echo "GOVCMS_TEST_CANARY is set, syncing the database."
+ drush sql-drop -y
  drush sql-sync @govcms.prod @self -y
  fi
  common_deploy

.docker/images/govcms8/settings/production.settings.php

@@ -13,7 +13,7 @@
 $config['system.logging']['error_level'] = 'hide';
 
 // Set max cache lifetime to 1h by default.
-$config['system.performance']['cache']['page']['max_age'] = 3600;
+$config['system.performance']['cache']['page']['max_age'] = 900;
 if (is_numeric($max_age=GETENV('CACHE_MAX_AGE'))) {
  $config['system.performance']['cache']['page']['max_age'] = $max_age;
 }

.env.default

@@ -43,8 +43,8 @@ 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.x-dev
-DRUPAL_CORE_VERSION=8.7.9
+GOVCMS_PROJECT_VERSION=release/1.0-stable-dev
+DRUPAL_CORE_VERSION=8.8.1
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. v0.22.0) - make sure you change it for both lines
 # See https://github.com/amazeeio/lagoon/releases

composer.json

@@ -22,12 +22,11 @@
  "cweagans/composer-patches": "^1.6.5",
  "drupal-composer/drupal-scaffold": "^2.5",
  "drupal/console": "^1.0.2",
- "drupal/core": "^8.7",
  "drush/drush": "^9.0.0",
  "govcms/govcms": "^1.0",
  "webflo/drupal-finder": "^1.0.0",
  "webmozart/path-util": "^2.3",
- "webflo/drupal-core-strict": "^8.7",
+ "drupal/core-recommended": "^8.8",
  "drupal/fast_404":"1.0.0-alpha4",
  "drupal/lagoon_logs":"1.x-dev",
  "drupal/redis":"1.1.0",

docker-compose.yml

@@ -22,7 +22,7 @@ services:
  dockerfile: $PWD/.docker/Dockerfile.govcms8
  args:
  GOVCMS_PROJECT_VERSION: ${GOVCMS_PROJECT_VERSION:-^1.0}
- DRUPAL_CORE_VERSION: ${DRUPAL_CORE_VERSION:-^8.7}
+ DRUPAL_CORE_VERSION: ${DRUPAL_CORE_VERSION:-^8.8}
  LAGOON_IMAGE_VERSION: ${LAGOON_IMAGE_VERSION:-latest}
  PHP_IMAGE_VERSION: ${PHP_IMAGE_VERSION:-7.2}
  image: ${DOCKERHUB_NAMESPACE:-govcms8lagoon}/govcms8