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 - Remove apk package installation #3465

Closed
wants to merge 1 commit into from
Closed
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
6 changes: 3 additions & 3 deletions concourse/pipelines/autodelete-cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
params:
Expand All @@ -142,7 +142,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 11251948d5dd4867552f9b9836a9e02110304df5
run:
path: sh
args:
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: d233a6d5064fc720fb90fdb1c1e773ac21f3857c
tag: 11251948d5dd4867552f9b9836a9e02110304df5
run:
path: ./paas-cf/concourse/scripts/rds_instances.sh
args:
Expand Down
37 changes: 18 additions & 19 deletions concourse/pipelines/create-cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,72 +11,72 @@ meta:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
psql: &psql-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/psql
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
node: &node-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
node-chromium: &node-chromium-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/node-chromium
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
cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
cf-uaac: &cf-uaac-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
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
golang: &golang-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/golang
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
terraform: &terraform-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
curl-ssl: &curl-ssl-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/curl-ssl
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5


tasks:
Expand Down Expand Up @@ -272,7 +272,7 @@ resource_types:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/concourse-pool-resource
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

- name: s3-iam
type: registry-image
Expand Down Expand Up @@ -822,7 +822,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down Expand Up @@ -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}')"
Expand Down Expand Up @@ -5419,7 +5418,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/spruce
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down Expand Up @@ -6680,7 +6679,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-uaac
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: passwords
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/deployment-kick-off.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/alpine
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: deployment-timer
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/awscli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

run:
path: ./paas-cf/concourse/scripts/rds_instances.sh
Expand All @@ -86,7 +86,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down
10 changes: 5 additions & 5 deletions concourse/pipelines/destroy-cloudfoundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: config
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/bosh-cli-v2
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: bosh-vars-store
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/ruby
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: cf-tfstate
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/terraform
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: terraform-variables
Expand Down
6 changes: 3 additions & 3 deletions concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
params:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
run:
path: bash
args:
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
run:
path: bash
args:
Expand Down
2 changes: 1 addition & 1 deletion concourse/pipelines/monitor-remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
type: registry-image
source:
repository: ghcr.io/alphagov/paas/self-update-pipelines
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

inputs:
- name: paas-cf
Expand Down
8 changes: 4 additions & 4 deletions concourse/pipelines/test-certificate-rotation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ 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

cf-acceptance-tests: &cf-acceptance-tests-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5

cf-cli: &cf-cli-image-resource
type: registry-image
source:
repository: ghcr.io/alphagov/paas/cf-cli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5


resource_types:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/aiven-broker-acceptance-tests-run.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/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: test-config
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/app-autoscaler-acceptance-tests-run.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/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: admin-creds
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-az-is-enabled-in-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
params:
DEPLOY_ENV:
BOSH_ENVIRONMENT:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-az-is-enabled-in-vpc.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
params:
AWS_DEFAULT_REGION:
EXPECTED_ACL_NAME:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/check-billing-comparison-with-cf.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/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-billing
params:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/configure-grafana.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/ruby
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-trusted-people
run:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/create_admin.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/cf-uaac
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
- name: cf-manifest
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/create_nonadmin.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/cf-cli
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
inputs:
- name: paas-cf
outputs:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/cronitor-monitor-ping-action.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/cf-acceptance-tests
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
run:
path: sh
args:
Expand Down
2 changes: 1 addition & 1 deletion concourse/tasks/curl-az-healthcheck.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/curl-ssl
tag: b5568301ae03da8220c5ea2f907088dfa38e963d
tag: 11251948d5dd4867552f9b9836a9e02110304df5
params:
AVAILABILITY_ZONE:
ENABLE_AZ_HEALTHCHECK:
Expand Down
Loading