From 4cae3e7a6e31d795266ffe6ac60a6446fabc6c58 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 1 Sep 2023 12:06:40 +0200 Subject: [PATCH] buildkite: docker login (#11565) --- .buildkite/hooks/pre-command | 10 +++++++++- .buildkite/hooks/pre-exit | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 427b4a0f1ad..acb73845547 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -65,7 +65,7 @@ get_os_details() { } if command -v docker &>/dev/null; then - echo "--- Prepare docker context :docker:" + echo "--- Prepare Elastic docker context :docker:" DOCKER_REGISTRY_SECRET_PATH="secret/ci/elastic-apm-server/docker-elastic-observability" DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}") DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}") @@ -74,6 +74,14 @@ if command -v docker &>/dev/null; then unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET export DOCKER_REGISTRY_SECRET retry 4 docker pull --quiet docker.elastic.co/infra/release-manager:latest + + echo "--- Prepare dockerhub context :docker:" + DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/observability-ci/docker-hub-observability" + DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}") + DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}") + DOCKERHUB_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}") + docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}" + unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET fi echo "--- Setting up the :golang: environment..." diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit index 8368ff3d62c..90e6efff6f2 100755 --- a/.buildkite/hooks/pre-exit +++ b/.buildkite/hooks/pre-exit @@ -9,4 +9,5 @@ unset VAULT_SECRET if command -v docker &>/dev/null; then docker logout $DOCKER_REGISTRY_SECRET + docker logout $DOCKERHUB_REGISTRY_SECRET fi