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

Use docker creds from ci/common

(cherry picked from commit fd4afdbd2c)
release-11.6.1+security-01
Kevin Minehart 2 months ago committed by jev forsberg
parent 002dbf1542
commit 4a01194a7d
  1. 6
      .drone.yml
  2. 4
      scripts/drone/vault.star

@ -5407,13 +5407,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
--- ---
@ -5544,6 +5544,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 86a35c782c5c90d76d7c82202f6e736274057f31e5f9071f140abb3f0229d9ae hmac: c0e27d237198566806eb4b6309a0f017f88a3733c57c40651536cad5bf92c8fc
... ...

@ -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