From 871b497ffa1c717f5bb9f7e89cfc226e183521d5 Mon Sep 17 00:00:00 2001 From: aetos Date: Mon, 6 Oct 2025 17:00:49 +0000 Subject: [PATCH 1/8] Update .drone.yml updated drone yaml with correct way to use unix socks --- .drone.yml | 71 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index aa6ba08..b3e6205 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,68 +3,81 @@ kind: pipeline type: docker name: default -# Platform specification for ARM64 runners +# ARM64 platform (for your Pi runner) platform: os: linux arch: arm64 +# Mount host Docker socket so steps can use Docker CLI +volumes: + - name: docker_sock + host: + path: /var/run/docker.sock + +workspace: + path: /drone/src + steps: - # Step 1: Check if Docker image for current version already exists + # Step 1: Check if image for the latest tag exists locally - name: check-version image: docker:24 - environment: - DOCKER_HOST: unix:///var/run/docker.sock + volumes: + - name: docker_sock + path: /var/run/docker.sock commands: - apk add --no-cache git - git fetch --tags - | - # Get the latest Git tag LATEST_TAG=$(git describe --tags --abbrev=0) echo "Latest Git tag: $LATEST_TAG" - - # Check if Docker image exists + 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 0 + echo "✅ Docker image apps/homepage:$LATEST_TAG already exists — skipping build" + exit 78 # tells Drone to stop pipeline gracefully else - echo "Docker image apps/homepage:$LATEST_TAG not found — building..." + echo "⚙️ Docker image apps/homepage:$LATEST_TAG not found — proceeding to build..." fi - # Step 2: Build Docker image with dynamic Git tag + # Step 2: Build Docker image (dynamic tag) - name: build-image image: docker:24 - environment: - DOCKER_HOST: unix:///var/run/docker.sock + volumes: + - name: docker_sock + path: /var/run/docker.sock commands: - - IMAGE_TAG=${DRONE_TAG:-latest} - - echo "Building Docker image apps/homepage:$IMAGE_TAG ..." - - docker build -t apps/homepage:$IMAGE_TAG . + - | + IMAGE_TAG=${DRONE_TAG:-latest} + echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..." + docker build -t apps/homepage:$IMAGE_TAG . - # Step 3: Stop old container if exists + # Step 3: Stop old container (if exists) - name: stop-old image: docker:24 - environment: - DOCKER_HOST: unix:///var/run/docker.sock + volumes: + - name: docker_sock + path: /var/run/docker.sock commands: - - IMAGE_TAG=${DRONE_TAG:-latest} - - echo "Stopping old container..." - - docker rm -f homepage || true + - | + echo "🛑 Stopping old container..." + docker rm -f homepage || true - # Step 4: Run container with dynamic tag + # Step 4: Run container - name: run-container image: docker:24 - environment: - DOCKER_HOST: unix:///var/run/docker.sock + volumes: + - name: docker_sock + path: /var/run/docker.sock commands: - - IMAGE_TAG=${DRONE_TAG:-latest} - - echo "Starting container apps/homepage:$IMAGE_TAG ..." - - docker run -d \ + - | + IMAGE_TAG=${DRONE_TAG:-latest} + echo "🚀 Starting container apps/homepage:$IMAGE_TAG ..." + docker run -d \ --name homepage \ -p 3001:3000 \ -e NODE_ENV=production \ apps/homepage:$IMAGE_TAG -# Trigger pipeline on Git tags +# Trigger rules trigger: event: - push From 78271baba12d1760de2be6f43da7ed3fa0e1b101 Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 09:34:53 +0000 Subject: [PATCH 2/8] Update .drone.yml using DOCKER_HOST to deploy on private-pi --- .drone.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index b3e6205..f0dbda1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,12 +8,6 @@ platform: os: linux arch: arm64 -# Mount host Docker socket so steps can use Docker CLI -volumes: - - name: docker_sock - host: - path: /var/run/docker.sock - workspace: path: /drone/src @@ -21,9 +15,8 @@ steps: # Step 1: Check if image for the latest tag exists locally - name: check-version image: docker:24 - volumes: - - name: docker_sock - path: /var/run/docker.sock + environment: + DOCKER_HOST: tcp://private-pi:2376 commands: - apk add --no-cache git - git fetch --tags @@ -41,9 +34,8 @@ steps: # Step 2: Build Docker image (dynamic tag) - name: build-image image: docker:24 - volumes: - - name: docker_sock - path: /var/run/docker.sock + environment: + DOCKER_HOST: tcp://private-pi:2376 commands: - | IMAGE_TAG=${DRONE_TAG:-latest} @@ -53,9 +45,8 @@ steps: # Step 3: Stop old container (if exists) - name: stop-old image: docker:24 - volumes: - - name: docker_sock - path: /var/run/docker.sock + environment: + DOCKER_HOST: tcp://private-pi:2376 commands: - | echo "🛑 Stopping old container..." @@ -64,9 +55,8 @@ steps: # Step 4: Run container - name: run-container image: docker:24 - volumes: - - name: docker_sock - path: /var/run/docker.sock + environment: + DOCKER_HOST: tcp://private-pi:2376 commands: - | IMAGE_TAG=${DRONE_TAG:-latest} From b346f02282a0ce6fc5946512741245457788d31d Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 09:42:28 +0000 Subject: [PATCH 3/8] Update .drone.yml using both server-pi (to clone and get tag) and private-pi for docker --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index f0dbda1..3c947fc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,7 @@ steps: - name: check-version image: docker:24 environment: - DOCKER_HOST: tcp://private-pi:2376 + DOCKER_HOST: unix:///var/run/docker.sock commands: - apk add --no-cache git - git fetch --tags From 1a2c725f6b387b8b56c9d586a6d2a1ddd0e1f823 Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 09:49:53 +0000 Subject: [PATCH 4/8] Update .drone.yml changed from private-pi to 192.168.1.111 --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3c947fc..94c1bf7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,7 +35,7 @@ steps: - name: build-image image: docker:24 environment: - DOCKER_HOST: tcp://private-pi:2376 + DOCKER_HOST: tcp://192.168.1.111:2376 commands: - | IMAGE_TAG=${DRONE_TAG:-latest} @@ -46,7 +46,7 @@ steps: - name: stop-old image: docker:24 environment: - DOCKER_HOST: tcp://private-pi:2376 + DOCKER_HOST: tcp://192.168.1.111:2376 commands: - | echo "🛑 Stopping old container..." @@ -56,7 +56,7 @@ steps: - name: run-container image: docker:24 environment: - DOCKER_HOST: tcp://private-pi:2376 + DOCKER_HOST: tcp://192.168.1.111:2376 commands: - | IMAGE_TAG=${DRONE_TAG:-latest} From 8760d61b22073c4a6b5bad50b99792558cbecca7 Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 10:01:17 +0000 Subject: [PATCH 5/8] Update .drone.yml using host network --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 94c1bf7..2233d21 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: - | IMAGE_TAG=${DRONE_TAG:-latest} echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..." - docker build -t apps/homepage:$IMAGE_TAG . + docker build --network=host -t apps/homepage:$IMAGE_TAG . # Step 3: Stop old container (if exists) - name: stop-old From 54cabc5f7f8f32f9d01d93ed6acbf3f1ffdb5488 Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 10:12:45 +0000 Subject: [PATCH 6/8] Update .drone.yml split check version into 2 steps to tackle different environments for git and docker tag comparison --- .drone.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2233d21..df55891 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,23 +12,33 @@ workspace: path: /drone/src steps: - # Step 1: Check if image for the latest tag exists locally - - name: check-version + # Step 1a: Git fetch tags locally + - name: fetch-tags image: docker:24 environment: - DOCKER_HOST: unix:///var/run/docker.sock + DOCKER_HOST: unix:///var/run/docker.sock # local Docker, if needed commands: - apk add --no-cache git - git fetch --tags - | LATEST_TAG=$(git describe --tags --abbrev=0) - echo "Latest Git tag: $LATEST_TAG" + echo "Latest Git tag fetched: $LATEST_TAG" + # Save to file to share with next step + echo $LATEST_TAG > /drone/src/LATEST_TAG.txt - 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 # tells Drone to stop pipeline gracefully + # Step 1b: Check if image exists on remote LAN Docker + - name: check-remote-image + image: docker:24 + environment: + DOCKER_HOST: tcp://192.168.1.111:2376 # remote Docker + commands: + - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) + - echo "Checking if apps/homepage:$IMAGE_TAG exists on remote Docker..." + - 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 else - echo "⚙️ Docker image apps/homepage:$LATEST_TAG not found — proceeding to build..." + echo "⚙️ Docker image apps/homepage:$IMAGE_TAG not found — proceeding to build..."; fi # Step 2: Build Docker image (dynamic tag) From 1f65582e77c05910a86a1e5c73d5ee6752798e3c Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 10:13:38 +0000 Subject: [PATCH 7/8] Update .drone.yml fixes --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index df55891..c4ebf96 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,8 @@ steps: commands: - IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) - echo "Checking if apps/homepage:$IMAGE_TAG exists on remote Docker..." - - if docker image inspect apps/homepage:$IMAGE_TAG > /dev/null 2>&1; then + - | + 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 else From a803759384ebb1696bf02ed00ec998cc296360ae Mon Sep 17 00:00:00 2001 From: aetos Date: Fri, 10 Oct 2025 10:22:12 +0000 Subject: [PATCH 8/8] Update .drone.yml using LATEST_TAG instead of DRONE_TAG which not be present if the push itsn't for tag push --- .drone.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c4ebf96..6237e29 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,9 +49,13 @@ steps: DOCKER_HOST: tcp://192.168.1.111:2376 commands: - | - IMAGE_TAG=${DRONE_TAG:-latest} + IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) + if [ -z "$IMAGE_TAG" ]; then + echo "❌ No tag found in LATEST_TAG.txt — cannot build." + exit 1 + fi echo "🔨 Building Docker image apps/homepage:$IMAGE_TAG ..." - docker build --network=host -t apps/homepage:$IMAGE_TAG . + docker build --network=host -t apps/homepage:$IMAGE_TAG -t apps/homepage:latest # Step 3: Stop old container (if exists) - name: stop-old @@ -70,7 +74,7 @@ steps: DOCKER_HOST: tcp://192.168.1.111:2376 commands: - | - IMAGE_TAG=${DRONE_TAG:-latest} + IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt) echo "🚀 Starting container apps/homepage:$IMAGE_TAG ..." docker run -d \ --name homepage \