Merge pull request #63 from B-urb/development

Development
B-urb · Jun 18, 2024 · feb1575 · feb1575
2 parents 97c508b + 7b6e125
commit feb1575
Show file tree

Hide file tree

Showing 9 changed files with 380 additions and 42 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -49,6 +49,9 @@ jobs:
   build-docker:
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     steps:
@@ -63,12 +66,25 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/doclytics:${{ env.BRANCH_NAME }}
           platforms: linux/amd64,linux/arm64
+      - name: 'Login to GitHub Container Registry'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - name: Build and push to GitHub Container Registry
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
+          platforms: linux/amd64,linux/arm64
   release:
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -62,6 +62,9 @@ jobs:
   build-docker:
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
     if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -76,11 +79,24 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: 'Login to GitHub Container Registry'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/doclytics:${{ env.BRANCH_NAME }}
           platforms: linux/amd64,linux/arm64
+      - name: Build and push to GitHub Container Registry
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
+          platforms: linux/amd64,linux/arm64
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,6 +45,9 @@ jobs:
 
   build-docker:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
     if: ${{ github.ref }} != 'master' && ${{ github.ref }} != 'development'
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -60,9 +63,22 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/doclytics:${{ env.BRANCH_NAME }}
+          platforms: linux/amd64,linux/arm64
+      - name: 'Login to GitHub Container Registry'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - name: Build and push to GitHub Container Registry
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/b-urb/doclytics:${{ env.BRANCH_NAME }}
           platforms: linux/amd64,linux/arm64