DockerHub fix

eclipse-aaspe · Sep 8, 2023 · bbd7e6f · bbd7e6f
1 parent 327c01c
commit bbd7e6f
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 42 deletions.
diff --git a/.github/workflows/build-and-publish-docker-images-release.yml b/.github/workflows/build-and-publish-docker-images-release.yml
@@ -0,0 +1,72 @@
+name: Build-and-publish-docker-images-release-workflow
+
+on:
+  push:
+    branches:
+      - main
+      - master
+      - '*/Fix-*-docker*'
+
+  release:
+    types: [published]
+
+jobs:
+  Build-and-publish-docker-release-images:
+    runs-on: ubuntu-latest
+    if: contains(github.event.pull_request.body, 'The workflow build-and-publish-docker-images was intentionally skipped.') == false
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Build and publish AasxServerBlazor
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-blazor-for-demo
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerBlazor
+
+      - name: Build and publish AasxServerBlazor-arm32
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-blazor-for-demo-arm32
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm32
+
+      - name: Build and publish AasxServerBlazor-arm64
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-blazor-for-demo-arm64
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm64
+
+      - name: Build and publish AasxServerCore
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerCore
+
+      - name: Build and publish AasxServerCore-arm32
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo-arm32
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerCore-arm32
+
+      - name: Build and publish AasxServerCore-arm64
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo-arm64
+          tag_with_ref: true
+          dockerfile: src/docker/Dockerfile-AasxServerCore-arm64
diff --git a/.github/workflows/build-and-publish-docker-images.yml b/.github/workflows/build-and-publish-docker-images.yml
@@ -3,7 +3,7 @@ name: Build-and-publish-docker-images-workflow
 on:
   push:
     branches:
-      - jtikekar/masterV3.0
+      - '**V3**'
 
   release:
     types: [published]
@@ -17,14 +17,14 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      # - name: Build and publish AasxServerBlazor
-      #   uses: docker/build-push-action@v1
-      #   with:
-      #     username: adminshellio
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      #     repository: adminshellio/aasx-server-blazor-for-demo
-      #     tag_with_ref: true
-      #     dockerfile: src/docker/Dockerfile-AasxServerBlazor
+      - name: Build and publish AasxServerBlazor
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-blazor-for-demo
+          tags: v3latest
+          dockerfile: src/docker/Dockerfile-AasxServerBlazor
 
       - name: Build and publish AasxServerBlazor-arm32
         uses: docker/build-push-action@v1
@@ -33,41 +33,40 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-blazor-for-demo-arm32
           tags: v3latest
-          #tag_with_ref: true
           dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm32
 
-      # - name: Build and publish AasxServerBlazor-arm64
-      #   uses: docker/build-push-action@v1
-      #   with:
-      #     username: adminshellio
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      #     repository: adminshellio/aasx-server-blazor-for-demo-arm64
-      #     tag_with_ref: true
-      #     dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm64
+      - name: Build and publish AasxServerBlazor-arm64
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-blazor-for-demo-arm64
+          tags: v3latest
+          dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm64
 
-      # - name: Build and publish AasxServerCore
-      #   uses: docker/build-push-action@v1
-      #   with:
-      #     username: adminshellio
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      #     repository: adminshellio/aasx-server-core-for-demo
-      #     tag_with_ref: true
-      #     dockerfile: src/docker/Dockerfile-AasxServerCore
+      - name: Build and publish AasxServerCore
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo
+          tags: v3latest
+          dockerfile: src/docker/Dockerfile-AasxServerCore
 
-      # - name: Build and publish AasxServerCore-arm32
-      #   uses: docker/build-push-action@v1
-      #   with:
-      #     username: adminshellio
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      #     repository: adminshellio/aasx-server-core-for-demo-arm32
-      #     tag_with_ref: true
-      #     dockerfile: src/docker/Dockerfile-AasxServerCore-arm32
+      - name: Build and publish AasxServerCore-arm32
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo-arm32
+          tags: v3latest
+          dockerfile: src/docker/Dockerfile-AasxServerCore-arm32
 
-      # - name: Build and publish AasxServerCore-arm64
-      #   uses: docker/build-push-action@v1
-      #   with:
-      #     username: adminshellio
-      #     password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      #     repository: adminshellio/aasx-server-core-for-demo-arm64
-      #     tag_with_ref: true
-      #     dockerfile: src/docker/Dockerfile-AasxServerCore-arm64
+      - name: Build and publish AasxServerCore-arm64
+        uses: docker/build-push-action@v1
+        with:
+          username: adminshellio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: adminshellio/aasx-server-core-for-demo-arm64
+          tags: v3latest
+          dockerfile: src/docker/Dockerfile-AasxServerCore-arm64