Merge pull request #29 from govCMS/develop

Prepare v1.1.2 release

.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

.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

.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

.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
 

.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

.version.yml

@@ -1,3 +1,3 @@
 version: 8
 type: saas
-scaffold: 1.1.1
+scaffold: 1.1.2

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