verify docker push and login

.gitlab-ci.yml

@@ -17,8 +17,8 @@ variables:
   tags: ["ubuntu", "vm"]       # Must match your runner tags
   image: docker:24.0.9         # Docker CLI available
   before_script:
-    - echo "Using host Docker daemon"
-    - docker info || true      # check Docker access
+    - echo "Checking Docker access..."
+    - docker info || true      # just in case
 
 # =====================================================================
 #                             LINT
@@ -84,17 +84,15 @@ diag:
 build:
   stage: build
   extends: .build_template
-  script: |
-    echo "Logging in to Docker registry..."
-    echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-    echo "Building Docker image for commit: ${CI_COMMIT_SHORT_SHA}"
-    docker build \
-      --build-arg REDDIT_CLIENT_ID="$REDDIT_CLIENT_ID" \
-      --build-arg REDDIT_CLIENT_SECRET="$REDDIT_CLIENT_SECRET" \
-      -t $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA .
-  after_script:
+  script:
+    - echo "Building Docker image for commit: ${CI_COMMIT_SHORT_SHA}"
+    - docker build \
+        --build-arg REDDIT_CLIENT_ID="$REDDIT_CLIENT_ID" \
+        --build-arg REDDIT_CLIENT_SECRET="$REDDIT_CLIENT_SECRET" \
+        -t $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA .
     - echo "Docker image built successfully!"
+    - echo "Listing local images:"
+    - docker images
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
@@ -108,27 +106,26 @@ build:
 deploy:
   stage: deploy
   extends: .build_template
-  script: |
-    echo "Logging in to Docker registry..."
-    echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-    # Verify login
-    docker info | grep Username || (echo "Docker login failed!" && exit 1)
+  script:
+    - echo "Logging in to Docker Hub..."
+    - echo "$DOCKER_TOKEN" | docker login -u "$DOCKER_USERNAME" --password-stdin
+    - docker info | grep Username || (echo "Docker login failed!" && exit 1)
 
-    echo "Listing local Docker images before push..."
-    docker images
+    - echo "Listing local images before push:"
+    - docker images
 
-    echo "Pushing Docker image: $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA"
-    docker push $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA
+    - echo "Pushing image: $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA"
+    - docker push $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA || (echo "Push failed!" && exit 1)
 
-    if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
-      echo "Tagging image as latest..."
-      docker tag $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA $DOCKERHUB_REPO:latest
-      echo "Pushing latest tag..."
-      docker push $DOCKERHUB_REPO:latest
-    fi
+    - if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
+        echo "Tagging image as latest...";
+        docker tag $DOCKERHUB_REPO:$CI_COMMIT_SHORT_SHA $DOCKERHUB_REPO:latest;
+        echo "Pushing latest tag...";
+        docker push $DOCKERHUB_REPO:latest || (echo "Push latest failed!" && exit 1);
+      fi
 
-    echo "Listing local Docker images after push..."
-    docker images
+    - echo "Listing local images after push:"
+    - docker images
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
\ No newline at end of file
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - when: never
\ No newline at end of file