From ecbae33cf76aca54506e6df3adffeb96e8ca8836 Mon Sep 17 00:00:00 2001
From: Gandalf <gandalf@storm.pl>
Date: Sat, 3 Jan 2026 09:15:07 +0100
Subject: [PATCH] feat: Add Docker Swarm deployment scripts for zero downtime

- Update docker/docker-compose.yml for Swarm with start-first update order
- Add scripts/deploy-swarm.sh for deploying with health check validation
- Add scripts/rollback-swarm.sh for quick rollback to previous version
- Remove obsolete denser-auth service from compose file
---
 docker/docker-compose.yml | 84 +++++++++++++++++--------------------
 scripts/deploy-swarm.sh   | 88 +++++++++++++++++++++++++++++++++++++++
 scripts/rollback-swarm.sh |  8 ++++
 3 files changed, 134 insertions(+), 46 deletions(-)
 create mode 100755 scripts/deploy-swarm.sh
 create mode 100755 scripts/rollback-swarm.sh

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f4c4fa3f1..4cad896bd 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,54 +1,46 @@
 name: 'denser'
+
 services:
-  denser-auth:
-    image: registry.gitlab.syncad.com/hive/denser/auth:${AUTH_IMAGE_TAG:-latest}
-    environment:
-      PORT: ${AUTH_PORT}
-      REACT_APP_API_ENDPOINT:
-      REACT_APP_IMAGES_ENDPOINT:
-      REACT_APP_SITE_DOMAIN:
-      TURBO_APP_SCOPE: '@hive/auth'
-      TURBO_APP_PATH: '/apps/auth'
-    ports:
-      - '${AUTH_PORT}:${AUTH_PORT}'
-    healthcheck:
-      test: ['CMD-SHELL', 'wget --no-verbose --tries=1 --spider http://$${HOSTNAME}:$${PORT}/ || exit 1']
-      interval: 1m30s
-      timeout: 30s
-      retries: 5
-      start_period: 30s
   denser-blog:
-    image: registry.gitlab.syncad.com/hive/denser/blog:${BLOG_IMAGE_TAG:-latest}
-    environment:
-      PORT: ${BLOG_PORT}
-      REACT_APP_API_ENDPOINT:
-      REACT_APP_IMAGES_ENDPOINT:
-      REACT_APP_SITE_DOMAIN:
-      TURBO_APP_SCOPE: '@hive/blog'
-      TURBO_APP_PATH: '/apps/blog'
+    image: registry.gitlab.syncad.com/hive/denser/blog:${VERSION:?VERSION required}
     ports:
-      - '${BLOG_PORT}:${BLOG_PORT}'
+      - '3000:3000'
+    environment:
+      PORT: 3000
+    volumes:
+      - ${ENV_FILE:?ENV_FILE must be set}:/app/apps/.env:ro
+    deploy:
+      replicas: 1
+      update_config:
+        order: start-first
+        failure_action: rollback
+      rollback_config:
+        order: start-first
     healthcheck:
-      test: ['CMD-SHELL', 'wget --no-verbose --tries=1 --spider http://$${HOSTNAME}:$${PORT}/ || exit 1']
-      interval: 1m30s
-      timeout: 30s
-      retries: 5
-      start_period: 30s
+      test: ['CMD', 'wget', '-q', '--spider', 'http://localhost:3000/trending']
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
+
   denser-wallet:
-    image: registry.gitlab.syncad.com/hive/denser/wallet:${WALLET_IMAGE_TAG:-latest}
-    environment:
-      PORT: ${WALLET_PORT}
-      REACT_APP_API_ENDPOINT:
-      REACT_APP_IMAGES_ENDPOINT:
-      REACT_APP_SITE_DOMAIN:
-      REACT_APP_BLOG_DOMAIN:
-      TURBO_APP_SCOPE: '@hive/wallet'
-      TURBO_APP_PATH: '/apps/wallet'
+    image: registry.gitlab.syncad.com/hive/denser/wallet:${VERSION:?VERSION required}
     ports:
-      - '${WALLET_PORT}:${WALLET_PORT}'
+      - '4000:3000'
+    environment:
+      PORT: 3000
+    volumes:
+      - ${ENV_FILE:?ENV_FILE must be set}:/app/apps/.env:ro
+    deploy:
+      replicas: 1
+      update_config:
+        order: start-first
+        failure_action: rollback
+      rollback_config:
+        order: start-first
     healthcheck:
-      test: ['CMD-SHELL', 'wget --no-verbose --tries=1 --spider http://$${HOSTNAME}:$${PORT}/ || exit 1']
-      interval: 1m30s
-      timeout: 30s
-      retries: 5
-      start_period: 30s
+      test: ['CMD', 'wget', '-q', '--spider', 'http://localhost:3000/']
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
diff --git a/scripts/deploy-swarm.sh b/scripts/deploy-swarm.sh
new file mode 100755
index 000000000..c68bb9a76
--- /dev/null
+++ b/scripts/deploy-swarm.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -e
+
+print_help() {
+    cat <<EOF
+Usage: $0 VERSION [OPTIONS]
+
+Deploy Denser services using Docker Swarm with zero downtime.
+
+Arguments:
+  VERSION                 Image version/tag to deploy (required)
+
+Options:
+  --env-file=PATH         Path to .env file (default: \$HOME/denser/.env)
+  --help                  Show this help
+
+Examples:
+  $0 5e8618a0
+  $0 5e8618a0 --env-file=/opt/denser/.env
+EOF
+}
+
+VERSION=""
+ENV_FILE=""
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --env-file=*)
+            ENV_FILE="${1#*=}"
+            ;;
+        --help|-h)
+            print_help
+            exit 0
+            ;;
+        -*)
+            echo "Unknown option: $1"
+            print_help
+            exit 1
+            ;;
+        *)
+            if [ -z "$VERSION" ]; then
+                VERSION="$1"
+            else
+                echo "Unexpected argument: $1"
+                print_help
+                exit 1
+            fi
+            ;;
+    esac
+    shift
+done
+
+if [ -z "$VERSION" ]; then
+    echo "ERROR: VERSION is required"
+    print_help
+    exit 1
+fi
+
+if [ -z "$ENV_FILE" ]; then
+    if [ -z "$HOME" ]; then
+        echo "ERROR: --env-file required (HOME not set)"
+        exit 1
+    fi
+    ENV_FILE="$HOME/denser/.env"
+fi
+
+ENV_FILE="$(cd "$(dirname "$ENV_FILE")" && pwd)/$(basename "$ENV_FILE")"
+
+if [ ! -f "$ENV_FILE" ]; then
+    echo "ERROR: Env file not found: $ENV_FILE"
+    exit 1
+fi
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+COMPOSE_FILE="$SCRIPT_DIR/../docker/docker-compose.yml"
+
+echo "Deploying version: $VERSION"
+echo "Using env file: $ENV_FILE"
+
+docker pull "registry.gitlab.syncad.com/hive/denser/blog:${VERSION}"
+docker pull "registry.gitlab.syncad.com/hive/denser/wallet:${VERSION}"
+
+export VERSION
+export ENV_FILE
+docker stack deploy -c "$COMPOSE_FILE" denser
+
+echo "Done. Check status: docker service ls"
diff --git a/scripts/rollback-swarm.sh b/scripts/rollback-swarm.sh
new file mode 100755
index 000000000..584e7fc39
--- /dev/null
+++ b/scripts/rollback-swarm.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+echo "Rolling back to previous version..."
+docker service rollback denser_denser-blog
+docker service rollback denser_denser-wallet
+echo "Done. Check status: docker service ls"
-- 
GitLab