build with tag docker

.gitlab-ci.yml

@@ -10,9 +10,6 @@ variables:
   KEEP_IMAGES: 3
   BUILD_MODE: static
 
-# =====================================================
-# 🔑 AUTH TO REGISTRY
-# =====================================================
 before_script:
   - echo "🔐 Logging in to GitLab Container Registry..."
   - echo "$GITLAB_TOKEN" | docker login -u "$GITLAB_USER" --password-stdin "$CI_REGISTRY"
@@ -27,24 +24,21 @@ build-image:
     - docker:dind
   variables:
     DOCKER_TLS_CERTDIR: ""
-  script:
-    - echo "🚀 Building Docker image for ${DEPLOY_ENV} branch..."
+  script: |
+    echo "🚀 Building Docker image for ${DEPLOY_ENV} branch..."
+    export TAG="${DEPLOY_ENV}_${CI_COMMIT_SHORT_SHA}"
+    echo "🧱 Tagging image as: $IMAGE_NAME:$TAG"
 
-    # Tag format: web-lti:development_<commit>
-    - export TAG="${DEPLOY_ENV}_${CI_COMMIT_SHORT_SHA}"
+    docker build \
+      --build-arg NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+      --build-arg NEXT_PUBLIC_SSO_LOGIN_URL=$NEXT_PUBLIC_SSO_LOGIN_URL \
+      --build-arg BUILD_MODE=$BUILD_MODE \
+      -t "$IMAGE_NAME:$TAG" \
+      -t "$IMAGE_NAME:$DEPLOY_ENV" .
 
-    - echo "🧱 Tagging image as: $IMAGE_NAME:$TAG"
-    - docker build \
-        --build-arg NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
-        --build-arg NEXT_PUBLIC_LTI_API_START_URL=$NEXT_PUBLIC_LTI_API_START_URL \
-        --build-arg NEXT_PUBLIC_LTI_CLIENT_ID=$NEXT_PUBLIC_LTI_CLIENT_ID \
-        --build-arg BUILD_MODE=$BUILD_MODE \
-        -t "$IMAGE_NAME:$TAG" \
-        -t "$IMAGE_NAME:$DEPLOY_ENV" .
-
-    - echo "📦 Pushing images to registry..."
-    - docker push "$IMAGE_NAME:$TAG"
-    - docker push "$IMAGE_NAME:$DEPLOY_ENV"
+    echo "📦 Pushing images to registry..."
+    docker push "$IMAGE_NAME:$TAG"
+    docker push "$IMAGE_NAME:$DEPLOY_ENV"
   only:
     - development
 
@@ -54,26 +48,25 @@ build-image:
 cleanup-registry:
   stage: cleanup
   image: alpine:3.20
-  script:
-    - apk add --no-cache curl jq
-    - echo "🧹 Cleaning up old images (keeping ${KEEP_IMAGES})..."
+  script: |
+    apk add --no-cache curl jq
+    echo "🧹 Cleaning up old images (keeping ${KEEP_IMAGES})..."
 
-    - TOKEN=$(curl --silent --request POST --header "Content-Type: application/json" \
-        --data "{\"login\": \"$GITLAB_USER\", \"password\": \"$GITLAB_TOKEN\"}" \
-        "${CI_REGISTRY}/jwt/auth" | jq -r '.token')
+    TOKEN=$(curl --silent --request POST --header "Content-Type: application/json" \
+      --data "{\"login\": \"$GITLAB_USER\", \"password\": \"$GITLAB_TOKEN\"}" \
+      "${CI_REGISTRY}/jwt/auth" | jq -r '.token')
 
-    - ALL_TAGS=$(curl --silent --header "Authorization: Bearer $TOKEN" \
-        "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/tags/list" \
-        | jq -r '.tags | sort | reverse | .['$KEEP_IMAGES':] | @sh' | tr -d "'")
+    ALL_TAGS=$(curl --silent --header "Authorization: Bearer $TOKEN" \
+      "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/tags/list" \
+      | jq -r ".tags | sort | reverse | .[${KEEP_IMAGES}:]" | jq -r '.[]')
 
-    - |
-      for tag in $ALL_TAGS; do
-        echo "🗑️  Deleting old image tag: $tag"
-        DIGEST=$(curl --silent -H "Authorization: Bearer $TOKEN" \
-          "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/manifests/$tag" | jq -r '.config.digest')
-        curl --silent -X DELETE -H "Authorization: Bearer $TOKEN" \
-          "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/manifests/${DIGEST}"
-      done
+    for tag in $ALL_TAGS; do
+      echo "🗑️  Deleting old image tag: $tag"
+      DIGEST=$(curl --silent -H "Authorization: Bearer $TOKEN" \
+        "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/manifests/$tag" | jq -r '.config.digest')
+      curl --silent -X DELETE -H "Authorization: Bearer $TOKEN" \
+        "${CI_REGISTRY}/v2/${CI_PROJECT_PATH}/web-lti/manifests/${DIGEST}" || true
+    done
   only:
     - development
   when: always
@@ -90,13 +83,13 @@ deploy:
     - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
     - ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
-  script:
-    - echo "🚀 Deploying $IMAGE_NAME:$DEPLOY_ENV to $SERVER_USER@$SERVER_IP"
-    - ssh $SERVER_USER@$SERVER_IP "
-        docker login -u '$GITLAB_USER' -p '$GITLAB_TOKEN' $CI_REGISTRY &&
-        docker pull $IMAGE_NAME:$DEPLOY_ENV &&
-        docker compose -f /home/devops/docker/deployment/development/compose/docker-compose.web-lti.yaml up -d dev-web-lti &&
-        docker image prune -f
-      "
+  script: |
+    echo "🚀 Deploying $IMAGE_NAME:$DEPLOY_ENV to $SERVER_USER@$SERVER_IP"
+    ssh $SERVER_USER@$SERVER_IP "
+      docker login -u '$GITLAB_USER' -p '$GITLAB_TOKEN' $CI_REGISTRY &&
+      docker pull $IMAGE_NAME:$DEPLOY_ENV &&
+      docker compose -f /home/devops/docker/deployment/development/compose/docker-compose.web-lti.yaml up -d dev-web-lti &&
+      docker image prune -f
+    "
   only:
     - development