Merge pull request #231 from cloud-gov/update-images

update to use hardened containers
cloud-gov · Jul 1, 2024 · 8664ef3 · 8664ef3
2 parents 3870d20 + 84296c6
commit 8664ef3
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 16 deletions.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -336,6 +336,15 @@ resources:
 
 
 resource_types:
+- name: registry-image
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: registry-image-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
 - name: slack-notification
   type: registry-image
   source:
@@ -348,16 +357,38 @@ resource_types:
 - name: bosh-deployment
   type: registry-image
   source:
-    repository: cloudfoundry/bosh-deployment-resource
-    registry_mirror:
-      host: docker-registry-mirror.app.cloud.gov:443
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: bosh-deployment-resource
+    aws_region: us-gov-west-1
+    tag: latest
 
 - name: s3-iam
   type: registry-image
   source:
-    repository: 18fgsa/s3-resource
-    registry_mirror:
-      host: docker-registry-mirror.app.cloud.gov:443
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: s3-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
+- name: git
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: git-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
+- name: bosh-io-stemcell
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: bosh-io-stemcell-resource
+    aws_region: us-gov-west-1
+    tag: latest
 
 - name: terraform
   type: docker-image

diff --git a/ci/smoke-test.yml b/ci/smoke-test.yml
@@ -6,9 +6,9 @@ image_resource:
   source:
     aws_access_key_id: ((ecr_aws_key))
     aws_secret_access_key: ((ecr_aws_secret))
-    repository: harden-concourse-task
+    repository: general-task
     aws_region: us-gov-west-1
-    tag: ((harden-concourse-task-tag))
+    tag: latest
 
 inputs:
 - name: concourse-config

diff --git a/jumpbox-pages.yml b/jumpbox-pages.yml
@@ -6,9 +6,9 @@ image_resource:
   source:
     aws_access_key_id: ((ecr_aws_key))
     aws_secret_access_key: ((ecr_aws_secret))
-    repository: harden-concourse-task
+    repository: general-task
     aws_region: us-gov-west-1
-    tag: ((harden-concourse-task-tag))
+    tag: latest
 
 inputs:
 - name: concourse-config

diff --git a/jumpbox.yml b/jumpbox.yml
@@ -6,9 +6,9 @@ image_resource:
   source:
     aws_access_key_id: ((ecr_aws_key))
     aws_secret_access_key: ((ecr_aws_secret))
-    repository: harden-concourse-task
+    repository: general-task
     aws_region: us-gov-west-1
-    tag: ((harden-concourse-task-tag))
+    tag: latest
 
 inputs:
 - name: concourse-config

diff --git a/shell-pipeline-pages.yml b/shell-pipeline-pages.yml
@@ -54,7 +54,29 @@ resources:
     branch: main
 
 resource_types:
+- name: registry-image
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: registry-image-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
 - name: s3-iam
-  type: docker-image
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: s3-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
+- name: git
+  type: registry-image
   source:
-    repository: 18fgsa/s3-resource
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: git-resource
+    aws_region: us-gov-west-1
+    tag: latest
diff --git a/shell-pipeline.yml b/shell-pipeline.yml
@@ -165,7 +165,29 @@ resources:
     commit_verification_keys: ((cloud-gov-pgp-keys))
 
 resource_types:
+- name: registry-image
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: registry-image-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
 - name: s3-iam
-  type: docker-image
+  type: registry-image
+  source:
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: s3-resource
+    aws_region: us-gov-west-1
+    tag: latest
+
+- name: git
+  type: registry-image
   source:
-    repository: 18fgsa/s3-resource
+    aws_access_key_id: ((ecr_aws_key))
+    aws_secret_access_key: ((ecr_aws_secret))
+    repository: git-resource
+    aws_region: us-gov-west-1
+    tag: latest