buildkite: docker login (#11565)

(cherry picked from commit 7cd8d1b)
elastic · Sep 1, 2023 · 40f15c6 · 40f15c6
1 parent 7011c5e
commit 40f15c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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