186049138 - awscli docker image includes openssh

Description: - Since the newer awscli-image-resource now includes openssh we can bump the version and remove the line installing it using apk
alphagov · Oct 19, 2023 · e0ecabf · e0ecabf
1 parent 9061827
commit e0ecabf
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/concourse/pipelines/concourse-lite-self-terminate.yml b/concourse/pipelines/concourse-lite-self-terminate.yml
@@ -8,7 +8,7 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/awscli
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 
 resources:
   - name: delete-timer

diff --git a/concourse/pipelines/create-bosh-concourse.yml b/concourse/pipelines/create-bosh-concourse.yml
@@ -8,51 +8,52 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/alpine
-        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
     certstrap: &certstrap-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/certstrap
-        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
     self-update-pipelines: &self-update-pipelines-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/self-update-pipelines
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
     spruce: &spruce-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/spruce
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
     terraform: &terraform-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/terraform
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 
 groups:
   - name: all
     jobs:
+      - test-aws-cli-image
       - update-pipeline
       - init-bucket
       - check-for-secrets
@@ -102,7 +103,7 @@ resource_types:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/keyval-resource
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 
 resources:
   - name: paas-bootstrap
@@ -380,6 +381,20 @@ resources:
     type: key-value
 
 jobs:
+  - name: test-aws-cli-image
+    plan:
+      - task: test-generation-of-ssh-keys
+        config:
+          platform: linux
+          image_resource: *awscli-image-resource
+          run:
+            path: sh
+            args:
+              - -e
+              - -c
+              - |
+                ssh-keygen -t rsa -b 4096 -f git_id_rsa -N ''
+                ls -la
   - name: update-pipeline
     serial: true
     plan:
@@ -642,7 +657,6 @@ jobs:
                 cp git-ssh-private-key/git_id_rsa generated-git-ssh-keys
                 exit 0
               fi
-              apk add --update openssh
               cd generated-git-ssh-keys
               ssh-keygen -t rsa -b 4096 -f git_id_rsa -N ''
         on_success:

diff --git a/concourse/pipelines/destroy-bosh-concourse.yml b/concourse/pipelines/destroy-bosh-concourse.yml
@@ -8,12 +8,12 @@ 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
     ruby-slim: &ruby-slim-image-resource
       type: registry-image
       source:
@@ -23,12 +23,12 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/self-update-pipelines
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
     terraform: &terraform-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/terraform
-        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+        tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 
 resource_types:
 - name: s3-iam

diff --git a/concourse/tasks/delete-ssh-keys.yml b/concourse/tasks/delete-ssh-keys.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 inputs:
   - name: paas-bootstrap
 run:

diff --git a/concourse/tasks/render-bosh-manifest.yml b/concourse/tasks/render-bosh-manifest.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/bosh-cli-v2
-    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
+    tag: abaa70dedffac57d65c8c9dacaa578633d1b07d4
 inputs:
   - name: bosh-vars-store
     optional: true