186049138 - Remove apk package installation

Description: - cf-uaac-image-resource already has g++ musl-dev make so this line is unnecessary - Bump docker image versions
alphagov · Oct 19, 2023 · 8401826 · 8401826
1 parent 79b793c
commit 8401826
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 63 deletions.
diff --git a/concourse/pipelines/autodelete-cloudfoundry.yml b/concourse/pipelines/autodelete-cloudfoundry.yml
@@ -115,7 +115,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/alpine
-              tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           inputs:
             - name: paas-cf
           params:
@@ -142,7 +142,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/bosh-cli-v2
-              tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           run:
             path: sh
             args:
@@ -178,7 +178,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/awscli
-              tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           run:
             path: ./paas-cf/concourse/scripts/rds_instances.sh
             args:

diff --git a/concourse/pipelines/create-cloudfoundry.yml b/concourse/pipelines/create-cloudfoundry.yml
@@ -11,72 +11,72 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/alpine
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     psql: &psql-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/psql
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     node: &node-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/node
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     node-chromium: &node-chromium-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/node-chromium
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     awscli: &awscli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/awscli
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/bosh-cli-v2
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     cf-acceptance-tests: &cf-acceptance-tests-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     cf-cli: &cf-cli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-cli
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     cf-uaac: &cf-uaac-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-uaac
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     git-ssh: &git-ssh-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/git-ssh
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     ruby-slim: &ruby-slim-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/ruby
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     golang: &golang-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/golang
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     terraform: &terraform-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/terraform
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
     curl-ssl: &curl-ssl-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/curl-ssl
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
 
   tasks:
@@ -272,7 +272,7 @@ resource_types:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/concourse-pool-resource
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
 - name: s3-iam
   type: registry-image
@@ -822,7 +822,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: paas-cf
@@ -4561,7 +4561,6 @@ jobs:
               - -e
               - -c
               - |
-                apk add --quiet --no-progress --no-cache g++ musl-dev make
                 uaac target "${UAA_API_URL}"
                 uaac token client get admin -s "${UAA_ADMIN_CLIENT_SECRET}"
                 CF_TOKEN="bearer $(uaac contexts | awk '$1 ~ /access_token/ {print $2}')"
@@ -5419,7 +5418,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/spruce
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: paas-cf
@@ -6680,7 +6679,7 @@ jobs:
           type: registry-image
           source:
             repository: ghcr.io/alphagov/paas/cf-uaac
-            tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+            tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
         inputs:
           - name: passwords

diff --git a/concourse/pipelines/deployment-kick-off.yml b/concourse/pipelines/deployment-kick-off.yml
@@ -41,7 +41,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/alpine
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           inputs:
             - name: paas-cf
             - name: deployment-timer
@@ -71,7 +71,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/awscli
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           run:
             path: ./paas-cf/concourse/scripts/rds_instances.sh
@@ -86,7 +86,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: paas-cf
@@ -119,7 +119,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: paas-cf

diff --git a/concourse/pipelines/destroy-cloudfoundry.yml b/concourse/pipelines/destroy-cloudfoundry.yml
@@ -99,7 +99,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: paas-cf
@@ -144,7 +144,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/cf-cli
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           inputs:
             - name: paas-cf
             - name: config
@@ -189,7 +189,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/bosh-cli-v2
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: bosh-vars-store
@@ -243,7 +243,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/ruby
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           inputs:
             - name: paas-cf
             - name: cf-tfstate
@@ -287,7 +287,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/terraform
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
           inputs:
             - name: terraform-variables

diff --git a/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml b/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
@@ -102,7 +102,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           inputs:
             - name: paas-cf
           params:
@@ -166,7 +166,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           run:
             path: bash
             args:
@@ -207,7 +207,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
-              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+              tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
           run:
             path: bash
             args:

diff --git a/concourse/pipelines/monitor-remote.yml b/concourse/pipelines/monitor-remote.yml
@@ -57,7 +57,7 @@ jobs:
         type: registry-image
         source:
           repository: ghcr.io/alphagov/paas/self-update-pipelines
-          tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+          tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
       inputs:
       - name: paas-cf

diff --git a/concourse/pipelines/test-certificate-rotation.yml b/concourse/pipelines/test-certificate-rotation.yml
@@ -5,25 +5,25 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/awscli
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
     bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/bosh-cli-v2
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
     cf-acceptance-tests: &cf-acceptance-tests-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
     cf-cli: &cf-cli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-cli
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 
 
 resource_types:

diff --git a/concourse/tasks/aiven-broker-acceptance-tests-run.yml b/concourse/tasks/aiven-broker-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-cf
   - name: test-config

diff --git a/concourse/tasks/app-autoscaler-acceptance-tests-run.yml b/concourse/tasks/app-autoscaler-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-cf
   - name: admin-creds

diff --git a/concourse/tasks/check-az-is-enabled-in-manifest.yml b/concourse/tasks/check-az-is-enabled-in-manifest.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/bosh-cli-v2
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 params:
   DEPLOY_ENV:
   BOSH_ENVIRONMENT:

diff --git a/concourse/tasks/check-az-is-enabled-in-vpc.yml b/concourse/tasks/check-az-is-enabled-in-vpc.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 params:
   AWS_DEFAULT_REGION:
   EXPECTED_ACL_NAME:

diff --git a/concourse/tasks/check-billing-comparison-with-cf.yml b/concourse/tasks/check-billing-comparison-with-cf.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-billing
 params:

diff --git a/concourse/tasks/configure-grafana.yml b/concourse/tasks/configure-grafana.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/ruby
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-trusted-people
 run:

diff --git a/concourse/tasks/create_admin.yml b/concourse/tasks/create_admin.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-uaac
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-cf
   - name: cf-manifest

diff --git a/concourse/tasks/create_nonadmin.yml b/concourse/tasks/create_nonadmin.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-cli
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 inputs:
   - name: paas-cf
 outputs:

diff --git a/concourse/tasks/cronitor-monitor-ping-action.yml b/concourse/tasks/cronitor-monitor-ping-action.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 run:
   path: sh
   args:

diff --git a/concourse/tasks/curl-az-healthcheck.yml b/concourse/tasks/curl-az-healthcheck.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/curl-ssl
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4 
 params:
   AVAILABILITY_ZONE:
   ENABLE_AZ_HEALTHCHECK: