Parametrized env variables

leplusorg · Mar 14, 2024 · 66fedb7 · 66fedb7
1 parent 19d7ac0
commit 66fedb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -17,6 +17,8 @@ jobs:
         platform: ['linux/amd64', 'linux/arm64']
     runs-on: ubuntu-latest
     steps:
+      - name: Set IMAGE
+        run: echo "IMAGE=${GITHUB_REPOSITORY#*/docker-}" >> ${GITHUB_ENV}
       - uses: actions/checkout@v4
       - name: Pull the latest ${{ matrix.platform }} image
-        run: docker pull --platform ${{ matrix.platform }} ${{ github.repository_owner }}/hash
+        run: docker pull --platform ${{ matrix.platform }} ${GITHUB_REPOSITORY_OWNER}/${IMAGE}
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -14,13 +14,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Set IMAGE
+        run: echo "IMAGE=${GITHUB_REPOSITORY#*/docker-}" >> ${GITHUB_ENV}
       - uses: actions/checkout@v4
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
       - uses: docker/metadata-action@v5
         id: meta
         with:
-          images: ${{ github.repository_owner }}/hash
+          images: ${{ github.repository_owner }}/${{ env.IMAGE }}
           tags: |
             type=schedule
             type=ref,event=branch
@@ -36,13 +38,13 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - uses: docker/build-push-action@v5
         with:
-          context: hash
+          context: ${{ env.IMAGE }}
           platforms: linux/amd64,linux/arm64
           pull: true
           push: ${{ github.event_name != 'pull_request' }}
           sbom: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Test the Docker image
-        working-directory: hash
+        working-directory: ${{ env.IMAGE }}
         run: docker compose -f docker-compose.test.yml run sut