fix publish-docker-images workflow (#2659)

elastic · Oct 16, 2024 · 7c77d1f · 7c77d1f
1 parent 5220533
commit 7c77d1f
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/.github/workflows/publish-docker-images.yml b/.github/workflows/publish-docker-images.yml
@@ -36,6 +36,9 @@ jobs:
           images = []
           with open(".ci/.docker-images.yml", "r") as stream:
             images.extend(yaml.safe_load(stream)['images'])
+            for image in images:
+              image['repository_name_without_owner'] = image['repository'].split('/')[-1]
+
           images_json = json.dumps(images)
           with open(os.environ['GITHUB_OUTPUT'], 'a') as f:
             print(f'include={images_json}', file=f)
@@ -53,33 +56,38 @@ jobs:
         working-directory: ${{ matrix.working_directory || '.' }}
     steps:
 
-      - uses: elastic/apm-pipeline-library/.github/actions/github-token@main
+      - name: Get token
+        id: get_token
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
         with:
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
+          app_id: ${{ secrets.ELASTIC_OBSERVABILITY_APP_ID }}
+          private_key: ${{ secrets.ELASTIC_OBSERVABILITY_APP_PEM }}
+          permissions: >-
+            {
+              "contents": "read"
+            }
+          repositories: >-
+            ["${{ matrix.repository_name_without_owner }}"]
 
       - uses: actions/checkout@v4
         with:
           repository: ${{ matrix.repository }}
-          token: ${{ env.GITHUB_TOKEN }}
+          token: ${{ steps.get_token.outputs.token }}
           ref: ${{ matrix.branch }}
 
-      - uses: elastic/apm-pipeline-library/.github/actions/docker-login@main
+      - name: Login to docker.elastic.co
+        uses: docker/login-action@v3
         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: elastic/apm-pipeline-library/.github/actions/docker-login@current
+      - name: Login to dockerhub
+        uses: docker/login-action@v3
         with:
-          registry: docker.io
-          secret: secret/observability-team/ci/elastic-observability-dockerhub
-          url: ${{ secrets.VAULT_ADDR }}
-          roleId: ${{ secrets.VAULT_ROLE_ID }}
-          secretId: ${{ secrets.VAULT_SECRET_ID }}
+          registry: ${{ secrets.DOCKERHUB_REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Prepare
         if: ${{ matrix.prepare_script }}
@@ -123,10 +131,8 @@ jobs:
             bash -c "${{ matrix.push_script }}"
           fi
 
-      - if: failure()
-        uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current
+      - if: failure() && github.event_name == 'schedule'
+        uses: elastic/oblt-actions/slack/notify-result@v1
         with:
-          vaultUrl: ${{ secrets.VAULT_ADDR }}
-          vaultRoleId: ${{ secrets.VAULT_ROLE_ID }}
-          vaultSecretId: ${{ secrets.VAULT_SECRET_ID }}
-          slackChannel: "#observablt-bots"
+          bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
+          channel-id: "#observablt-bots"