fix

MAAP-Project · Oct 23, 2024 · 5bb6759 · 5bb6759
1 parent 9041083
commit 5bb6759
Showing 1 changed file with 29 additions and 9 deletions.
diff --git a/.github/workflows/build-ogc-app-pack.yml b/.github/workflows/build-ogc-app-pack.yml
@@ -51,15 +51,35 @@ jobs:
           username: gitlab+deploy-token-6
           password: ${{ secrets.OGC_APP_PACK_GEN_CI_GH_ACTION_TOKEN }}
 
-      - name: Build algorithm docker image
-        run: | 
-          docker build -t ${{ env.REPO_NAME }}:${{ env.BRANCH }} \
-            --build-arg BASE_IMAGE_NAME=${{ env.BASE_IMAGE_NAME }} \
-            --build-arg REPO_NAME=${{ env.REPO_NAME }} \
-            --build-arg BRANCH=${{ env.BRANCH }} \
-            --build-arg REPO_URL_WITH_TOKEN=${{ env.REPO_URL_WITH_TOKEN }} \
-            --build-arg BUILD_CMD=${{ env.BUILD_CMD }} \
-            -f docker/Dockerfile.algorithm .
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ vars.GITLAB_CONTAINER_REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: ${{ steps.meta.outputs.tags }}
+
+
+      - name: Build and push algorithm Docker image
+        id: push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/Dockerfile.algorithm
+          push: true
+          pull: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      # - name: Build algorithm docker image
+      #   run: | 
+      #     docker build -t ${{ env.REPO_NAME }}:${{ env.BRANCH }} \
+      #       --build-arg BASE_IMAGE_NAME=${{ env.BASE_IMAGE_NAME }} \
+      #       --build-arg REPO_NAME=${{ env.REPO_NAME }} \
+      #       --build-arg BRANCH=${{ env.BRANCH }} \
+      #       --build-arg REPO_URL_WITH_TOKEN=${{ env.REPO_URL_WITH_TOKEN }} \
+      #       --build-arg BUILD_CMD=${{ env.BUILD_CMD }} \
+      #       -f docker/Dockerfile.algorithm .
       - name: Generate OGC application package process cwl
         run: python3 generate_app_pack.py algorithm_configs/algorithm_config.yaml ${{ env.REPO_NAME }}:${{ env.BRANCH }}
       - name: Build OGC application package docker image