fixes for IMAGE_TAG

.drone.yml

@@ -10,90 +10,112 @@ platform:
 workspace:
   path: /drone/src
 
+volumes:
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+
 steps:
   - name: fetch-tags
     image: docker:24
-    environment:
+    volumes:
-      DOCKER_HOST: unix:///var/run/docker.sock   # local Docker, if needed
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
       - apk add --no-cache git
       - git fetch --tags
       - |
-        LATEST_TAG=$(git describe --tags --abbrev=0)
+        # Get latest Git tag and trim newline
+        LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null | tr -d '\n')
         echo "Latest Git tag fetched: $LATEST_TAG"
-        # Save to file to share with next step
+
-        echo $LATEST_TAG > /drone/src/LATEST_TAG.txt
+        # Save to file for downstream steps
+        echo "$LATEST_TAG" > /drone/src/LATEST_TAG.txt
+
+        # Read back for verification
+        IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
+        echo "Image tag read from file: $IMAGE_TAG"
+
+        # Validate
+        if [ -z "$IMAGE_TAG" ]; then
+          echo "❌ No git tags found! Cannot continue."
+          exit 1
+        fi
 
   - name: check-remote-image
     image: docker:24
-    environment:
+    volumes:
-      DOCKER_HOST: tcp://192.168.1.111:2376   # remote Docker
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
-      - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt)
+      - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
+
       - echo "Checking if apps/homepage:$IMAGE_TAG exists on remote Docker..."
+      - echo "Existing Docker tags for apps/homepage:"
+      - docker images --format "{{.Repository}}:{{.Tag}}" | grep "^apps/homepage" || echo "(none)"
       - |
         if docker image inspect apps/homepage:$IMAGE_TAG > /dev/null 2>&1; then
-          echo "✅ Docker image apps/homepage:$IMAGE_TAG already exists — skipping build";
+          echo "✅ Docker image apps/homepage:$IMAGE_TAG already exists — skipping build"
-          exit 78;   # stop pipeline gracefully
+          exit 78
         else
-          echo "⚙️ Docker image apps/homepage:$IMAGE_TAG not found — proceeding to build...";
+          echo "⚙️ Docker image apps/homepage:$IMAGE_TAG not found — proceeding to build..."
         fi
 
   - name: build-image
     image: docker:24
-    environment:
+    volumes:
-      DOCKER_HOST: tcp://192.168.1.111:2376
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
-      - |
+      - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
-        IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt)
+
-        if [ -z "$IMAGE_TAG" ]; then
+      - echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..."
-          echo "❌ No tag found in LATEST_TAG.txt — cannot build."
+      - docker build --network=host -t apps/homepage:$IMAGE_TAG -t apps/homepage:latest /drone/src
-          exit 1
-        fi
-        echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..."
-        docker build --network=host -t apps/homepage:$IMAGE_TAG -t apps/homepage:latest .
 
   - name: push-image
     image: docker:24
     environment:
-      DOCKER_HOST: tcp://192.168.1.111:2376
       REGISTRY_HOST:
         from_secret: REGISTRY_HOST
       REGISTRY_USER:
         from_secret: REGISTRY_USER
       REGISTRY_PASS:
         from_secret: REGISTRY_PASS
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
-      - |
+      - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
-        IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt)
+
-        if [ -z "$IMAGE_TAG" ]; then
+      - echo "🔑 Logging into registry $REGISTRY_HOST ..."
-          echo "❌ No tag found in LATEST_TAG.txt — cannot push."
+      - echo "$REGISTRY_PASS" | docker login $REGISTRY_HOST -u "$REGISTRY_USER" --password-stdin
-          exit 1
+      - echo "🏷️ Tagging images with registry prefix..."
-        fi
+      - docker tag apps/homepage:$IMAGE_TAG $REGISTRY_HOST/apps/homepage:$IMAGE_TAG
-        echo "🔑 Logging into registry $REGISTRY_HOST ..."
+      - docker tag apps/homepage:$IMAGE_TAG $REGISTRY_HOST/apps/homepage:latest
-        echo "$REGISTRY_PASS" | docker login $REGISTRY_HOST -u "$REGISTRY_USER" --password-stdin
+      - echo "📤 Pushing apps/homepage:$IMAGE_TAG ..."
-        echo "📤 Pushing apps/homepage:$IMAGE_TAG ..."
+      - docker push $REGISTRY_HOST/apps/homepage:$IMAGE_TAG
-        docker push $REGISTRY_HOST/apps/homepage:$IMAGE_TAG
+      - echo "📤 Pushing apps/homepage:latest ..."
-        echo "📤 Pushing apps/homepage:latest ..."
+      - docker push $REGISTRY_HOST/apps/homepage:latest
-        docker push $REGISTRY_HOST/apps/homepage:latest
 
   - name: stop-old
     image: docker:24
-    environment:
+    volumes:
-      DOCKER_HOST: tcp://192.168.1.111:2376
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
-      - |
+      - echo "🛑 Stopping old container..."
-        echo "🛑 Stopping old container..."
+      - docker rm -f homepage || true
-        docker rm -f homepage || true
 
   - name: run-container
     image: docker:24
-    environment:
+    volumes:
-      DOCKER_HOST: tcp://192.168.1.111:2376
+      - name: dockersock
+        path: /var/run/docker.sock
     commands:
+      - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
+
+      - echo "🚀 Starting container apps/homepage:$IMAGE_TAG ..."
       - |
-        IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt)
-        echo "🚀 Starting container apps/homepage:$IMAGE_TAG ..."
         docker run -d \
           --name homepage \
           -p 3001:3000 \
@@ -105,3 +127,4 @@ steps:
 trigger:
   event:
     - tag
+    - custom