Merge pull request #4 from Slickdeals/OPS-10298-update-jira

gh actions doesnt like to push images
Slickdeals · Mar 19, 2024 · ad0fff5 · ad0fff5
2 parents 5f14733 + 3a3e87b
commit ad0fff5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/build-dev-image.yml b/.github/workflows/build-dev-image.yml
@@ -2,6 +2,8 @@ name: Build & Push Jira Development Docker Image to GHCR
 
 on:
   pull_request:
+    branches:
+      - develop
   push:
     branches: 
       - develop
@@ -22,12 +24,14 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GHCR
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ env.GITHUB_TOKEN }}
+        env:
+          GITHUB_USER: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v5
@@ -36,7 +40,7 @@ jobs:
           tags: |
             ${{ env.COMMIT_SHA }}
             ${{ vars.DEVELOP_TAG}}
-      - name: Build and push Docker image
+      - name: Build, Tag, and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: ./app

diff --git a/.github/workflows/build-release-image.yml b/.github/workflows/build-release-image.yml
@@ -1,6 +1,9 @@
 name: Build & Push Jira Release Docker Image to GHCR
 
 on:
+  pull_request:
+    branches:
+      - main
   push:
     branches: 
       - main
@@ -21,12 +24,14 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GHCR
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ env.GITHUB_TOKEN }}
+        env:
+          GITHUB_USER: ${{ github.actor }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata for the Docker image
         id: meta
         uses: docker/metadata-action@v5