Merge branch 'jtikekar/masterV3.0' of https://github.com/admin-shell-…

…io/aasx-server into jtikekar/masterV3.0

.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

.github/workflows/build-and-publish-docker-images.yml

@@ -3,17 +3,17 @@ name: Build-and-publish-docker-images-workflow
 on:
   push:
     branches:
-      - main
-      - master
-      - '*/Fix-*-docker*'
+      - '**V3**'
 
   release:
     types: [published]
 
 jobs:
   Build-and-publish-docker-images:
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.body, 'The workflow build-and-publish-docker-images was intentionally skipped.') == false
+    if: |
+      contains(github.event.pull_request.body, 'The workflow build-and-publish-docker-images was intentionally skipped.') == false &&
+      contains(github.event.head_commit.message, 'DockerHub')
     steps:
       - uses: actions/checkout@master
 
@@ -23,7 +23,7 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-blazor-for-demo
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerBlazor
 
       - name: Build and publish AasxServerBlazor-arm32
@@ -32,7 +32,7 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-blazor-for-demo-arm32
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm32
 
       - name: Build and publish AasxServerBlazor-arm64
@@ -41,7 +41,7 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-blazor-for-demo-arm64
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerBlazor-arm64
 
       - name: Build and publish AasxServerCore
@@ -50,7 +50,7 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-core-for-demo
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerCore
 
       - name: Build and publish AasxServerCore-arm32
@@ -59,7 +59,7 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-core-for-demo-arm32
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerCore-arm32
 
       - name: Build and publish AasxServerCore-arm64
@@ -68,5 +68,5 @@ jobs:
           username: adminshellio
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
           repository: adminshellio/aasx-server-core-for-demo-arm64
-          tag_with_ref: true
+          tags: v3latest
           dockerfile: src/docker/Dockerfile-AasxServerCore-arm64