update tag

uc-cdis · Jan 29, 2025 · a7dbd13 · a7dbd13
1 parent 3d2f391
commit a7dbd13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/civ2.yml b/.github/workflows/civ2.yml
@@ -14,6 +14,7 @@ jobs:
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
+      # TODO add ECR
       # # https://github.com/docker/login-action#aws-public-elastic-container-registry-ecr
       # - name: Login to ECR
       #   uses: docker/login-action@v3
@@ -83,7 +84,7 @@ jobs:
 
       # TODO linux/arm64 image
       - name: Build linux/amd64 image
-        run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=build currentTag=${{ env.IMAGE_TAG }}-normal-stable
+        run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=build currentTag=${{ env.IMAGE_TAG }}
 
       - name: Push linux/amd64 image
-        run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=push currentTag=${{ env.IMAGE_TAG }}-normal-stable pushTag=${{ env.IMAGE_TAG }} isTag=true
+        run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=push currentTag=${{ env.IMAGE_TAG }} pushTag=${{ env.IMAGE_TAG }} isTag=true
diff --git a/local-build.sh b/local-build.sh
@@ -194,8 +194,8 @@ if [[ $step == "push" ]]; then
     # tag previously built images and push them
     # docker tag orthancteam/orthanc:$currentTag orthancteam/orthanc-pre-release:$final_tag
     # docker push orthancteam/orthanc-pre-release:$final_tag
-    docker tag orthancteam/orthanc:$currentTag quay.io/cdis/orthanc:$currentTag
-    docker push quay.io/cdis/orthanc:$currentTag
+    docker tag orthancteam/orthanc:$currentTag quay.io/cdis/gen3-orthancteam-orthanc:$final_tag
+    docker push quay.io/cdis/gen3-orthancteam-orthanc:$final_tag
 
     exit 0
 else
@@ -301,9 +301,9 @@ fi
     #     tag_arg=
     # fi
 
+    # TODO add cache
     docker buildx build --add-host=orthanc.uclouvain.be:130.104.229.21 --progress=plain --platform=linux/amd64 $push_load_arg_final_image $tag_arg -f docker/orthanc/AmazonLinux2Dockerfile docker/orthanc/
 
-
     # sleep 5
     ###### orthancteam/orthanc
     # docker $build \