Specify govuk-ruby-2.7.X as base image for building app images

This commit updates the `build-images` pipeline to specify the `govuk-ruby-2.7.X` image as the base image for building app images.

There are a [number of different ways to do this](concourse/oci-build-task#14) but this commit uses makes use of the [`IMAGE_ARG_*` param as part of the `vito/oci-build-task` resource](concourse/oci-build-task#52) which allows us to use image resources already defined in the pipeline within our Dockerfiles, where the base image is served from a registry local to the pipeline. It does this by bringing in these images as resources, namespaced under separate ECR repositories, then passing in the appropriate image to the build process via the `IMAGE_ARG_base_image` param (reflected in app `Dockerfile`s); the `FROM` command in said `Dockerfile`s then point to the correct ECR repository for the `govuk-ruby-2.7.X` base image (rather than to Docker Hub).

concourse/pipelines/build-images.yml

@@ -126,6 +126,20 @@ resources:
       repository: frontend
       tag: latest
 
+  - <<: *docker-image
+    name: govuk-ruby-2.7.2
+    source:
+      <<: *docker-image-source
+      repository: govuk-ruby-2.7.2
+      tag: latest
+
+  - <<: *docker-image
+    name: govuk-ruby-2.7.3
+    source:
+      <<: *docker-image-source
+      repository: govuk-ruby-2.7.3
+      tag: latest
+
   - <<: *docker-image
     name: infra-concourse-task-image
     source:
@@ -287,6 +301,10 @@ jobs:
     - in_parallel:
       - get: smokey-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: smokey-version
         params:
           bump: minor
@@ -298,6 +316,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: smokey-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: smokey-image
       params:
         image: image/image.tar
@@ -327,6 +348,10 @@ jobs:
     - in_parallel:
       - get: content-store-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: content-store-version
         params:
           bump: minor
@@ -338,6 +363,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: content-store-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: content-store-image
       params:
         image: image/image.tar
@@ -360,6 +388,10 @@ jobs:
     - in_parallel:
       - get: frontend-repo
         trigger: true
+      - get: govuk-ruby-2.7.3
+        params:
+          format: oci
+        trigger: true
       - get: frontend-version
         params:
           bump: minor
@@ -371,6 +403,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: frontend-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: frontend-image
       params:
         image: image/image.tar
@@ -429,6 +464,10 @@ jobs:
     - in_parallel:
       - get: publisher-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: publisher-version
         params:
           bump: minor
@@ -440,6 +479,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: publisher-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: publisher-image
       params:
         image: image/image.tar
@@ -462,6 +504,10 @@ jobs:
     - in_parallel:
       - get: publishing-api-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: publishing-api-version
         params:
           bump: minor
@@ -473,6 +519,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: publishing-api-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: publishing-api-image
       params:
         image: image/image.tar
@@ -528,6 +577,10 @@ jobs:
     - in_parallel:
       - get: router-api-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: router-api-version
         params:
           bump: minor
@@ -539,6 +592,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: router-api-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: router-api-image
       params:
         image: image/image.tar
@@ -561,6 +617,10 @@ jobs:
     - in_parallel:
       - get: signon-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: signon-version
         params:
           bump: minor
@@ -572,6 +632,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: signon-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: signon-image
       params:
         image: image/image.tar
@@ -594,6 +657,10 @@ jobs:
     - in_parallel:
       - get: static-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: static-version
         params:
           bump: minor
@@ -605,6 +672,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: static-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: static-image
       params:
         image: image/image.tar
@@ -627,6 +697,10 @@ jobs:
     - in_parallel:
       - get: authenticating-proxy-repo
         trigger: true
+      - get: govuk-ruby-2.7.2
+        params:
+          format: oci
+        trigger: true
       - get: authenticating-proxy-version
         params:
           bump: minor
@@ -638,6 +712,9 @@ jobs:
       file: govuk-infrastructure/concourse/tasks/build-image-definition.yml
       input_mapping:
         git-repo: authenticating-proxy-repo
+        base-image: govuk-ruby-2.7.2
+      params:
+        IMAGE_ARG_base_image: base-image/image.tar
     - put: authenticating-proxy-image
       params:
         image: image/image.tar

concourse/tasks/build-image-definition.yml

@@ -5,6 +5,7 @@ image_resource:
     repository: vito/oci-build-task
 inputs:
 - name: git-repo
+- name: base-image
 outputs:
 - name: image
 params: