From 7cc58d6f148670a6ce981025576710f3e7cc4453 Mon Sep 17 00:00:00 2001 From: Steve Worley Date: Wed, 16 Oct 2019 19:21:27 +1100 Subject: [PATCH 1/5] Update cron to run every hour. - Changes root directory to /app in case the working dir of the cron pod changes. - Updates cron to run hourly. --- .lagoon.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.lagoon.yml b/.lagoon.yml index 4e06c31..012ae90 100644 --- a/.lagoon.yml +++ b/.lagoon.yml @@ -11,8 +11,9 @@ environments: master: types: mariadb: mariadb-shared + cronjobs: - name: drush cron - schedule: "*/15 * * * *" - command: 'drush cron' + schedule: "0 * * * *" + command: 'drush cron --root=/app' service: cli From dae23eea4571b85215093491e92974aa1e9b0d23 Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 18 Oct 2019 15:55:16 +1100 Subject: [PATCH 2/5] Update .lagoon.yml --- .lagoon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.lagoon.yml b/.lagoon.yml index 012ae90..8cf6c52 100644 --- a/.lagoon.yml +++ b/.lagoon.yml @@ -14,6 +14,6 @@ environments: cronjobs: - name: drush cron - schedule: "0 * * * *" + schedule: "*/15 * * * *" command: 'drush cron --root=/app' service: cli From d7fd73eab3a1ea4f187933491ca76565c9a16b6a Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Mon, 21 Oct 2019 08:15:12 +1000 Subject: [PATCH 3/5] Update .version.yml --- .version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version.yml b/.version.yml index ab5f0eb..10da282 100644 --- a/.version.yml +++ b/.version.yml @@ -1,3 +1,3 @@ version: 8 type: saas -scaffold: 1.0 +scaffold: 1.1.1 From 7c8c97f46e19d73a7050b148dd054cef0bc57cd0 Mon Sep 17 00:00:00 2001 From: Simon Hobbs Date: Thu, 24 Oct 2019 16:41:20 +1100 Subject: [PATCH 4/5] GOVCMS-3718: Env testing (#16) * GOVCMS-3718: Enable setting an image version, and dockerfiles that can use it --- .docker/Dockerfile.cli | 3 ++- .docker/Dockerfile.nginx-drupal | 5 +++-- .docker/Dockerfile.php | 5 +++-- .docker/Dockerfile.test | 3 ++- .env.default | 6 ++++++ docker-compose.yml | 10 ++++++++++ 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile.cli b/.docker/Dockerfile.cli index caaccef..88936dd 100644 --- a/.docker/Dockerfile.cli +++ b/.docker/Dockerfile.cli @@ -1,4 +1,5 @@ -FROM govcms8lagoon/govcms8 +ARG GOVCMS_IMAGE_VERSION=latest +FROM govcms8lagoon/govcms8:${GOVCMS_IMAGE_VERSION} COPY themes/ /app/web/themes/custom COPY config /app/config diff --git a/.docker/Dockerfile.nginx-drupal b/.docker/Dockerfile.nginx-drupal index 1d78924..27c7fde 100644 --- a/.docker/Dockerfile.nginx-drupal +++ b/.docker/Dockerfile.nginx-drupal @@ -1,6 +1,7 @@ ARG CLI_IMAGE -FROM ${CLI_IMAGE} as cli +ARG GOVCMS_IMAGE_VERSION=latest -FROM govcms8lagoon/nginx-drupal +FROM ${CLI_IMAGE} as cli +FROM govcms8lagoon/nginx-drupal:${GOVCMS_IMAGE_VERSION} COPY --from=cli /app /app diff --git a/.docker/Dockerfile.php b/.docker/Dockerfile.php index e29812a..d0e6436 100644 --- a/.docker/Dockerfile.php +++ b/.docker/Dockerfile.php @@ -1,6 +1,7 @@ ARG CLI_IMAGE -FROM ${CLI_IMAGE} as cli +ARG GOVCMS_IMAGE_VERSION=latest -FROM govcms8lagoon/php +FROM ${CLI_IMAGE} as cli +FROM govcms8lagoon/php:${GOVCMS_IMAGE_VERSION} COPY --from=cli /app /app diff --git a/.docker/Dockerfile.test b/.docker/Dockerfile.test index 39a4dcd..dad692f 100644 --- a/.docker/Dockerfile.test +++ b/.docker/Dockerfile.test @@ -1,4 +1,5 @@ -FROM govcms8lagoon/test +ARG GOVCMS_IMAGE_VERSION=latest +FROM govcms8lagoon/test:${GOVCMS_IMAGE_VERSION} COPY themes/ /app/web/themes/custom diff --git a/.env.default b/.env.default index 86773d3..8cb13fd 100644 --- a/.env.default +++ b/.env.default @@ -37,3 +37,9 @@ DEV_MODE=true # Note: Seckit click-jacking configuration will need altering to suit if changed. # See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options X_FRAME_OPTIONS=SameOrigin + +# Docker image tag that is used in the Dockerfiles, in order to get specific +# versions of GovCMS images. On Lagoon the value comes from a buildtime +# variable set via GraphQL api. +# @see progress https://github.com/amazeeio/lagoon/issues/1168 +#GOVCMS_IMAGE_VERSION=latest diff --git a/docker-compose.yml b/docker-compose.yml index 3f19e39..bbf24aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,9 @@ x-lagoon-project: x-lagoon-local-dev-url: &lagoon-local-dev-url http://govcms8-saas.docker.amazee.io +x-govcms-image-version: + &govcms-image-version ${GOVCMS_IMAGE_VERSION:-latest} + x-volumes: &default-volumes volumes: @@ -21,6 +24,7 @@ x-environment: LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-} LAGOON_PROJECT: *lagoon-project LAGOON_ROUTE: &default-url ${LOCALDEV_URL:-http://govcms8-saas.docker.amazee.io} + GOVCMS_IMAGE_VERSION: ${GOVCMS_IMAGE_VERSION:-latest} DEV_MODE: ${DEV_MODE:-false} X_FRAME_OPTIONS: ${X_FRAME_OPTIONS:-SameOrigin} @@ -30,6 +34,8 @@ services: build: context: . dockerfile: .docker/Dockerfile.cli + args: + GOVCMS_IMAGE_VERSION: *govcms-image-version image: *lagoon-project labels: lagoon.type: cli-persistent @@ -43,6 +49,8 @@ services: build: context: . dockerfile: .docker/Dockerfile.test + args: + GOVCMS_IMAGE_VERSION: *govcms-image-version labels: lagoon.type: none << : *default-volumes @@ -57,6 +65,7 @@ services: dockerfile: .docker/Dockerfile.nginx-drupal args: CLI_IMAGE: *lagoon-project + GOVCMS_IMAGE_VERSION: *govcms-image-version labels: lagoon.type: nginx-php-persistent lagoon.persistent: /app/web/sites/default/files/ @@ -76,6 +85,7 @@ services: dockerfile: .docker/Dockerfile.php args: CLI_IMAGE: *lagoon-project + GOVCMS_IMAGE_VERSION: *govcms-image-version labels: lagoon.type: nginx-php-persistent lagoon.name: nginx From 75de2f054a4632d1fd704b79916c557b604dae7a Mon Sep 17 00:00:00 2001 From: Stuart Rowlands Date: Thu, 24 Oct 2019 15:44:59 +1000 Subject: [PATCH 5/5] Bump scaffold version. --- .version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version.yml b/.version.yml index 10da282..e04d938 100644 --- a/.version.yml +++ b/.version.yml @@ -1,3 +1,3 @@ version: 8 type: saas -scaffold: 1.1.1 +scaffold: 1.1.2