clean up

.gitlab-ci.yml

@@ -10,7 +10,9 @@ variables:
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
   APPTAINER_DOCKER_TAG: "v3.9.4"
-  DOCKER_TAG: "lcsbbiocore/cobrexa.jl"
+  DOCKER_HUB_TAG: "lcsbbiocore/cobrexa.jl"
+  DOCKER_GHCR_TAG: "lcsb-biocore/docker/cobrexa.jl"
+  APPTAINER_GHCR_TAG: "lcsb-biocore/apptainer/cobrexa.jl"
 
 #
 # Predefined conditions for triggering jobs
@@ -254,32 +256,41 @@ apptainer-release:
   stage: assets
   script:
     - |
+      # build the container
       alias apptainer=singularity
       apptainer build cobrexa.sif cobrexa.def
     - |
+      # push to GHCR
       alias apptainer=singularity
       export SINGULARITY_DOCKER_USERNAME="$GITHUB_ACCESS_USERNAME"
       export SINGULARITY_DOCKER_PASSWORD="$GITHUB_ACCESS_TOKEN"
-      apptainer push cobrexa.sif "oras://ghcr.io/lcsb-biocore/cobrexa.jl:latest"
-      apptainer push cobrexa.sif "oras://ghcr.io/lcsb-biocore/cobrexa.jl:$CI_COMMIT_TAG"
+      apptainer push cobrexa.sif "oras://ghcr.io/$APPTAINER_GHCR_TAG:latest"
+      apptainer push cobrexa.sif "oras://ghcr.io/$APPTAINER_GHCR_TAG:$CI_COMMIT_TAG"
   <<: *global_build_apptainer
   <<: *global_trigger_release_containers
 
 docker-test:
   stage: assets
   script:
-    - docker build -t "$DOCKER_TAG:testing" .
+    - docker build -t "$DOCKER_HUB_TAG:testing" .
   <<: *global_dind
   <<: *global_trigger_test_containers
 
 docker-release:
   stage: assets
   script:
-    - docker build -t "$DOCKER_TAG:latest" .
-    - docker tag "$DOCKER_TAG:latest" "$DOCKER_TAG:$CI_COMMIT_TAG"
+    - docker build -t "$DOCKER_HUB_TAG:latest" .
+      # alias and push to docker hub
+    - docker tag "$DOCKER_HUB_TAG:latest" "$DOCKER_HUB_TAG:$CI_COMMIT_TAG"
     - echo "$DOCKER_IO_ACCESS_TOKEN" | docker login --username "$DOCKER_IO_USER" --password-stdin
-    - docker push "$DOCKER_TAG:latest"
-    - docker push "$DOCKER_TAG:$CI_COMMIT_TAG"
+    - docker push "$DOCKER_HUB_TAG:latest"
+    - docker push "$DOCKER_HUB_TAG:$CI_COMMIT_TAG"
+      # make 2 extra aliases and push to GHCR
+    - docker tag "$DOCKER_HUB_TAG:latest" "$DOCKER_GHCR_TAG:latest"
+    - docker tag "$DOCKER_HUB_TAG:latest" "$DOCKER_GHCR_TAG:$CI_COMMIT_TAG"
+    - echo "$GITHUB_ACCESS_TOKEN" | docker login ghcr.io --username "$GITHUB_ACCESS_USERNAME" --password-stdin
+    - docker push "$DOCKER_GHCR_TAG:latest"
+    - docker push "$DOCKER_GHCR_TAG:$CI_COMMIT_TAG"
   <<: *global_dind
   <<: *global_trigger_release_containers