github-actions: docker login with GitHub secrets (elastic#3658)

NicklasWallgren · May 30, 2024 · 0e1fb43 · 0e1fb43
1 parent e00a088
commit 0e1fb43
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -338,13 +338,14 @@ jobs:
     if: github.event_name != 'pull_request' || ( github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' )
     steps:
       - uses: actions/checkout@v4
-      - uses: elastic/apm-pipeline-library/.github/actions/docker-login@current
+
+      - name: Log in to the Elastic Container registry
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
-          registry: docker.elastic.co
-          secret: secret/observability-team/ci/docker-registry/prod
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
+          registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
+          username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
+          password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
+
       - uses: ./.github/workflows/unstash
         with:
           name: build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -135,13 +135,14 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
           fetch-depth: 0 # Load entire history as it is required for the push-script
-      - uses: elastic/apm-pipeline-library/.github/actions/docker-login@current
+
+      - name: Log in to the Elastic Container registry
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
-          registry: docker.elastic.co
-          secret: secret/apm-team/ci/docker-registry/prod
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
+          registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
+          username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
+          password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
+
       - name: "Build docker image"
         shell: bash
         run: ./scripts/docker-release/build_docker.sh "${{ env.RELEASE_VERSION }}"

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -80,13 +80,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: elastic/apm-pipeline-library/.github/actions/docker-login@current
+
+      - name: Log in to the Elastic Container registry
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
-          registry: docker.elastic.co
-          secret: secret/apm-team/ci/docker-registry/prod
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
+          registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }}
+          username: ${{ secrets.ELASTIC_DOCKER_USERNAME }}
+          password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }}
+
       - name: prepare context for testing docker build
         run: |
           mkdir -p elastic-apm-agent/target