CI: Use docker creds from ci/common (#104827)

Use docker creds from ci/common

(cherry picked from commit fd4afdbd2c)
release-11.2.9+security-01
Kevin Minehart 8 months ago committed by jev forsberg
parent db6ac304e7
commit 0951f3b56e
  1. 6
      .drone.yml
  2. 4
      scripts/drone/vault.star

@ -5503,13 +5503,13 @@ name: prerelease_bucket
--- ---
get: get:
name: username name: username
path: infra/data/ci/grafanaci-docker-hub path: ci/data/common/dockerhub
kind: secret kind: secret
name: docker_username name: docker_username
--- ---
get: get:
name: password name: password
path: infra/data/ci/grafanaci-docker-hub path: ci/data/common/dockerhub
kind: secret kind: secret
name: docker_password name: docker_password
--- ---
@ -5640,6 +5640,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: a92fdb0659c429ead489860ee89cd2b27870e6cf9f39e093fcfad21f09ce3e78 hmac: f0da71ffaa44671a6c0666891461ea51386f1c5c6b3b0c8bda1c056fdb501989
... ...

@ -55,8 +55,8 @@ def secrets():
vault_secret(gar_pull_secret, "secret/data/common/gar", ".dockerconfigjson"), vault_secret(gar_pull_secret, "secret/data/common/gar", ".dockerconfigjson"),
vault_secret(drone_token, "infra/data/ci/drone", "machine-user-token"), vault_secret(drone_token, "infra/data/ci/drone", "machine-user-token"),
vault_secret(prerelease_bucket, "infra/data/ci/grafana/prerelease", "bucket"), vault_secret(prerelease_bucket, "infra/data/ci/grafana/prerelease", "bucket"),
vault_secret(docker_username, "infra/data/ci/grafanaci-docker-hub", "username"), vault_secret(docker_username, "ci/data/common/dockerhub", "username"),
vault_secret(docker_password, "infra/data/ci/grafanaci-docker-hub", "password"), vault_secret(docker_password, "ci/data/common/dockerhub", "password"),
vault_secret( vault_secret(
gcp_upload_artifacts_key, gcp_upload_artifacts_key,
"infra/data/ci/grafana/releng/artifacts-uploader-service-account", "infra/data/ci/grafana/releng/artifacts-uploader-service-account",

Loading…
Cancel
Save