From b69af60f879b99099d7355a38463c0f90bb201e4 Mon Sep 17 00:00:00 2001 From: aetos Date: Tue, 21 Oct 2025 13:37:20 +0000 Subject: [PATCH] Update .drone.yml --- .drone.yml | 87 ++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/.drone.yml b/.drone.yml index 88a5e87..e6218d6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,10 +25,11 @@ steps: - apk add --no-cache git - git fetch --tags - | - LATEST_TAG=$(git describe --tags --abbrev=0) + # Get the latest Git tag and export as a Drone env variable + export LATEST_TAG=$(git describe --tags --abbrev=0) echo "Latest Git tag fetched: $LATEST_TAG" - # Save to file to share with next steps - echo $LATEST_TAG > /drone/src/LATEST_TAG.txt + # Make it available to downstream steps + echo "LATEST_TAG=$LATEST_TAG" >> /drone/env # - name: check-remote-image # image: docker:24 @@ -36,16 +37,15 @@ steps: # - name: dockersock # path: /var/run/docker.sock # commands: - # - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) - # - echo "Checking if apps/homepage:$IMAGE_TAG exists on remote Docker..." + # - echo "Checking if apps/homepage:$LATEST_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"; - # exit 78; # stop pipeline gracefully + # if docker image inspect apps/homepage:$LATEST_TAG > /dev/null 2>&1; then + # echo "✅ Docker image apps/homepage:$LATEST_TAG already exists — skipping build" + # exit 78 # else - # echo "⚙️ Docker image apps/homepage:$IMAGE_TAG not found — proceeding to build..."; + # echo "⚙️ Docker image apps/homepage:$LATEST_TAG not found — proceeding to build..." # fi # - name: build-image @@ -54,43 +54,41 @@ steps: # - name: dockersock # path: /var/run/docker.sock # commands: - # - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) # - | - # if [ -z "$IMAGE_TAG" ]; then - # echo "❌ No tag found in LATEST_TAG.txt — cannot build." + # if [ -z "$LATEST_TAG" ]; then + # echo "❌ No Git tag found — cannot build." # exit 1 # fi - # - echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..." - # - docker build --network=host -t apps/homepage:$IMAGE_TAG -t apps/homepage:latest /drone/src + # - echo "🔨 Building Docker image apps/homepage:$LATEST_TAG ..." + # - docker build --network=host -t apps/homepage:$LATEST_TAG -t apps/homepage:latest /drone/src - - name: push-image - image: docker:24 - environment: - 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) - - | - if [ -z "$IMAGE_TAG" ]; then - echo "❌ No tag found in LATEST_TAG.txt — cannot push." - exit 1 - fi - - echo "🔑 Logging into registry $REGISTRY_HOST ..." - - echo "$REGISTRY_PASS" | docker login $REGISTRY_HOST -u "$REGISTRY_USER" --password-stdin - - echo "🏷️ Tagging images with registry prefix..." - - docker tag apps/homepage:$IMAGE_TAG $REGISTRY_HOST/apps/homepage:$IMAGE_TAG - - docker tag apps/homepage:$IMAGE_TAG $REGISTRY_HOST/apps/homepage:latest - - echo "📤 Pushing apps/homepage:$IMAGE_TAG ..." - - docker push $REGISTRY_HOST/apps/homepage:$IMAGE_TAG - - echo "📤 Pushing apps/homepage:latest ..." - - docker push $REGISTRY_HOST/apps/homepage:latest + # - name: push-image + # image: docker:24 + # environment: + # 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: + # - | + # if [ -z "$LATEST_TAG" ]; then + # echo "❌ No Git tag found — cannot push." + # exit 1 + # fi + # - echo "🔑 Logging into registry $REGISTRY_HOST ..." + # - echo "$REGISTRY_PASS" | docker login $REGISTRY_HOST -u "$REGISTRY_USER" --password-stdin + # - echo "🏷️ Tagging images with registry prefix..." + # - docker tag apps/homepage:$LATEST_TAG $REGISTRY_HOST/apps/homepage:$LATEST_TAG + # - docker tag apps/homepage:$LATEST_TAG $REGISTRY_HOST/apps/homepage:latest + # - echo "📤 Pushing apps/homepage:$LATEST_TAG ..." + # - docker push $REGISTRY_HOST/apps/homepage:$LATEST_TAG + # - echo "📤 Pushing apps/homepage:latest ..." + # - docker push $REGISTRY_HOST/apps/homepage:latest - name: stop-old image: docker:24 @@ -107,14 +105,13 @@ steps: - name: dockersock path: /var/run/docker.sock commands: - - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) - - echo "🚀 Starting container apps/homepage:$IMAGE_TAG ..." + - echo "🚀 Starting container apps/homepage:$LATEST_TAG ..." - docker run -d \ --name homepage \ -p 3001:3000 \ -e NODE_ENV=production \ --restart always \ - apps/homepage:$IMAGE_TAG + apps/homepage:$LATEST_TAG # Trigger rules trigger: