Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

186049138 - awscli docker image includes openssh #677

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion concourse/pipelines/concourse-lite-self-terminate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

resources:
- name: delete-timer
Expand Down
21 changes: 10 additions & 11 deletions concourse/pipelines/create-bosh-concourse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,47 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
awscli: &awscli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
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: 11251948d5dd4867552f9b9836a9e02110304df5
certstrap: &certstrap-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/certstrap
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
git-ssh: &git-ssh-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/git-ssh
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
self-update-pipelines: &self-update-pipelines-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
spruce: &spruce-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/spruce
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

groups:
- name: all
Expand Down Expand Up @@ -102,7 +102,7 @@ resource_types:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/keyval-resource
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

resources:
- name: paas-bootstrap
Expand Down Expand Up @@ -642,7 +642,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:
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/destroy-bosh-concourse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
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: 11251948d5dd4867552f9b9836a9e02110304df5
ruby-slim: &ruby-slim-image-resource
type: registry-image
source:
Expand All @@ -23,12 +23,12 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

resource_types:
- name: s3-iam
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/delete-ssh-keys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-bootstrap
run:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/render-bosh-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image_resource:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: bosh-vars-store
optional: true
Expand Down