Merge branch 'develop' of https://github.com/ehrbase/ehrbase into develop

� Conflicts:
�	.github/workflows/build-multiarch-image-next.yml

Author: stefanspiska

.github/workflows/build-multiarch-image-next.yml

@@ -48,27 +48,27 @@ jobs:
           context: .
           platforms: linux/amd64
           push: true
-          tags: ehrbase/ehrbase:${TAG}-amd64
+          tags: ehrbase/ehrbase:${{env.TAG}}-amd64
 
       - name: Build and push (ARM64)
         uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/arm64
           push: true
-          tags: ehrbase/ehrbase:${TAG}-arm64
+          tags: ehrbase/ehrbase:${{env.TAG}}-arm64
 
       - name: Create and push MultiArch Manifest
         run: |
 
           docker buildx imagetools create \
-                 ehrbase/ehrbase:${TAG}-arm64 \
-                 ehrbase/ehrbase:${TAG}-amd64 \
-                 -t ehrbase/ehrbase:${TAG}
-          docker pull ehrbase/ehrbase:${TAG}
+                 ehrbase/ehrbase:${{env.TAG}}-arm64 \
+                 ehrbase/ehrbase:${{env.TAG}}-amd64 \
+                 -t ehrbase/ehrbase:${{env.TAG}}
+          docker pull ehrbase/ehrbase:${{env.TAG}}
 
       - name: Inspect MultiArch Manifest
-        run: docker manifest inspect ehrbase/ehrbase:${TAG}
+        run: docker manifest inspect ehrbase/ehrbase:${{env.TAG}}