Merge branch 'master' into development

.github/workflows/build_Docker_image_auto.yml

@@ -11,11 +11,33 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build and push Docker images
+      - name: Prepare
-        uses: docker/build-push-action@v1
+        id: prep
+        run: |
+          DOCKER_IMAGE=rabobankcdc/dettect
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+            VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          echo ::set-output name=tags::${TAGS}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: rabobankcdc/dettect
+
-          tags: latest
+      - name: Build and push Docker images
-          tag_with_ref: true
+        uses: docker/build-push-action@v2
+        with:
+          pull: true
+          push: true
+          tags: rabobankcdc/dettect:latest, ${{ steps.prep.outputs.tags }}

.github/workflows/build_Docker_image_manual.yml

@@ -3,9 +3,9 @@ on:
   workflow_dispatch:
     inputs:
       version_tag:
-        description: 'Format: v[version number]'  
+        description: 'Format: v[version number]'
         required: true
-jobs: 
+jobs:
   build:
     runs-on: ubuntu-latest
     steps:
@@ -13,10 +13,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build and push Docker images
+      - name: Set up Docker Buildx
-        uses: docker/build-push-action@v1
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: rabobankcdc/dettect
+
-          tags: latest, ${{ github.event.inputs.version_tag }}
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          pull: true
+          push: true
+          tags: rabobankcdc/dettect:latest, rabobankcdc/dettect:${{ github.event.inputs.version_tag }}