fix conditional push to Docker Hub + add variable usage

Signed-off-by: Przemysław Grądzki <[email protected]>
edmcouncil · Feb 3, 2024 · e9e88b0 · e9e88b0
1 parent 2ea062a
commit e9e88b0
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -10,13 +10,15 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
     steps:
       -
         name: Checkout
         uses: actions/checkout@v4
       -
         name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
+        if: ${{ env.dockerhub_username != '' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -29,27 +31,27 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: edmcouncil/ontology-publisher
+          images: ${{ github.repository }}
           labels: |
-            org.edmcouncil.ontology-publisher.release-date={{date 'YYYY-MM-DD'}}
-            org.edmcouncil.ontology-publisher.version={{branch}}
+            org.${{ github.repository_owner }}.ontology-publisher.release-date={{date 'YYYY-MM-DD'}}
+            org.${{ github.repository_owner }}.ontology-publisher.version={{branch}}
       -
-        name: Build and push edmcouncil/ontology-publisher:${{ steps.meta.outputs.version }} for linux/amd64 platform
+        name: Build and push ${{ github.repository }}:${{ steps.meta.outputs.version }} for linux/amd64 platform
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: edmcouncil/ontology-publisher:${{ steps.meta.outputs.version }}
+          push: ${{ env.dockerhub_username != '' }}
+          tags: ${{ github.repository }}:${{ steps.meta.outputs.version }}
           annotations: ${{ steps.meta.outputs.annotations }}
           labels: ${{ steps.meta.outputs.labels }}
       -
-        name: Build and push edmcouncil/ontology-publisher:${{ steps.meta.outputs.version }} for linux/arm64 platform
+        name: Build and push ${{ github.repository }}:${{ steps.meta.outputs.version }} for linux/arm64 platform
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: edmcouncil/ontology-publisher:${{ steps.meta.outputs.version }}
+          push: ${{ env.dockerhub_username != '' }}
+          tags: ${{ github.repository }}:${{ steps.meta.outputs.version }}
           annotations: ${{ steps.meta.outputs.annotations }}
           labels: ${{ steps.meta.outputs.labels }}