From e9ef8155d9b6972d070c032aad9cedea4a27996e Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Sun, 30 Nov 2025 02:17:53 -0600 Subject: [PATCH] refactor: remove deprecated installation scripts and enhance install.sh - Deleted canary.sh and feature.sh scripts as they are no longer needed. - Updated install.sh to support version detection and custom Docker Swarm initialization arguments. - Improved installation and update processes to accommodate version-specific Docker images. --- apps/website/public/canary.sh | 229 -------------------------------- apps/website/public/feature.sh | 231 --------------------------------- apps/website/public/install.sh | 49 ++++++- 3 files changed, 42 insertions(+), 467 deletions(-) delete mode 100644 apps/website/public/canary.sh delete mode 100644 apps/website/public/feature.sh diff --git a/apps/website/public/canary.sh b/apps/website/public/canary.sh deleted file mode 100644 index f07ac3d..0000000 --- a/apps/website/public/canary.sh +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/bash -install_dokploy() { - if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" >&2 - exit 1 - fi - - # check if is Mac OS - if [ "$(uname)" = "Darwin" ]; then - echo "This script must be run on Linux" >&2 - exit 1 - fi - - # check if is running inside a container - if [ -f /.dockerenv ]; then - echo "This script must be run on Linux" >&2 - exit 1 - fi - - # check if something is running on port 80 - if ss -tulnp | grep ':80 ' >/dev/null; then - echo "Error: something is already running on port 80" >&2 - exit 1 - fi - - # check if something is running on port 443 - if ss -tulnp | grep ':443 ' >/dev/null; then - echo "Error: something is already running on port 443" >&2 - exit 1 - fi - - # check if something is running on port 3000 - if ss -tulnp | grep ':3000 ' >/dev/null; then - echo "Error: something is already running on port 3000" >&2 - echo "Dokploy requires port 3000 to be available. Please stop any service using this port." >&2 - exit 1 - fi - - command_exists() { - command -v "$@" > /dev/null 2>&1 - } - - if command_exists docker; then - echo "Docker already installed" - else - curl -sSL https://get.docker.com | sh -s -- --version 28.5.0 - fi - - docker swarm leave --force 2>/dev/null - - get_ip() { - local ip="" - - # Try IPv4 first - # First attempt: ifconfig.io - ip=$(curl -4s --connect-timeout 5 https://ifconfig.io 2>/dev/null) - - # Second attempt: icanhazip.com - if [ -z "$ip" ]; then - ip=$(curl -4s --connect-timeout 5 https://icanhazip.com 2>/dev/null) - fi - - # Third attempt: ipecho.net - if [ -z "$ip" ]; then - ip=$(curl -4s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null) - fi - - # If no IPv4, try IPv6 - if [ -z "$ip" ]; then - # Try IPv6 with ifconfig.io - ip=$(curl -6s --connect-timeout 5 https://ifconfig.io 2>/dev/null) - - # Try IPv6 with icanhazip.com - if [ -z "$ip" ]; then - ip=$(curl -6s --connect-timeout 5 https://icanhazip.com 2>/dev/null) - fi - - # Try IPv6 with ipecho.net - if [ -z "$ip" ]; then - ip=$(curl -6s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null) - fi - fi - - if [ -z "$ip" ]; then - echo "Error: Could not determine server IP address automatically (neither IPv4 nor IPv6)." >&2 - echo "Please set the ADVERTISE_ADDR environment variable manually." >&2 - echo "Example: export ADVERTISE_ADDR=" >&2 - exit 1 - fi - - echo "$ip" - } - - get_private_ip() { - ip addr show | grep -E "inet (192\.168\.|10\.|172\.1[6-9]\.|172\.2[0-9]\.|172\.3[0-1]\.)" | head -n1 | awk '{print $2}' | cut -d/ -f1 - } - - advertise_addr="${ADVERTISE_ADDR:-$(get_private_ip)}" - - if [ -z "$advertise_addr" ]; then - echo "ERROR: We couldn't find a private IP address." - echo "Please set the ADVERTISE_ADDR environment variable manually." - echo "Example: export ADVERTISE_ADDR=192.168.1.100" - exit 1 - fi - echo "Using advertise address: $advertise_addr" - - docker swarm init --advertise-addr $advertise_addr - - if [ $? -ne 0 ]; then - echo "Error: Failed to initialize Docker Swarm" >&2 - exit 1 - fi - - echo "Swarm initialized" - - docker network rm -f dokploy-network 2>/dev/null - docker network create --driver overlay --attachable dokploy-network - - echo "Network created" - - mkdir -p /etc/dokploy - - chmod 777 /etc/dokploy - - docker service create \ - --name dokploy-postgres \ - --constraint 'node.role==manager' \ - --network dokploy-network \ - --env POSTGRES_USER=dokploy \ - --env POSTGRES_DB=dokploy \ - --env POSTGRES_PASSWORD=amukds4wi9001583845717ad2 \ - --mount type=volume,source=dokploy-postgres,target=/var/lib/postgresql/data \ - postgres:16 - - docker service create \ - --name dokploy-redis \ - --constraint 'node.role==manager' \ - --network dokploy-network \ - --mount type=volume,source=dokploy-redis,target=/data \ - redis:7 - - # Installation - docker service create \ - --name dokploy \ - --replicas 1 \ - --network dokploy-network \ - --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \ - --mount type=bind,source=/etc/dokploy,target=/etc/dokploy \ - --mount type=volume,source=dokploy,target=/root/.docker \ - --publish published=3000,target=3000,mode=host \ - --update-parallelism 1 \ - --update-order stop-first \ - --constraint 'node.role == manager' \ - -e RELEASE_TAG=canary \ - -e ADVERTISE_ADDR=$advertise_addr \ - dokploy/dokploy:canary - - sleep 4 - - docker run -d \ - --name dokploy-traefik \ - --restart always \ - -v /etc/dokploy/traefik/traefik.yml:/etc/traefik/traefik.yml \ - -v /etc/dokploy/traefik/dynamic:/etc/dokploy/traefik/dynamic \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -p 80:80/tcp \ - -p 443:443/tcp \ - -p 443:443/udp \ - traefik:v3.6.1 - - docker network connect dokploy-network dokploy-traefik - - # Optional: Use docker service create instead of docker run - # docker service create \ - # --name dokploy-traefik \ - # --constraint 'node.role==manager' \ - # --network dokploy-network \ - # --security-opt no-new-privileges:true \ - # --mount type=bind,source=/etc/dokploy/traefik/traefik.yml,target=/etc/traefik/traefik.yml \ - # --mount type=bind,source=/etc/dokploy/traefik/dynamic,target=/etc/dokploy/traefik/dynamic \ - # --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock,readonly \ - # --publish mode=host,published=443,target=443 \ - # --publish mode=host,published=80,target=80 \ - # --publish mode=host,published=443,target=443,protocol=udp \ - # traefik:v3.6.1 - - GREEN="\033[0;32m" - YELLOW="\033[1;33m" - BLUE="\033[0;34m" - NC="\033[0m" # No Color - - format_ip_for_url() { - local ip="$1" - if echo "$ip" | grep -q ':'; then - # IPv6 - echo "[${ip}]" - else - # IPv4 - echo "${ip}" - fi - } - - public_ip="${ADVERTISE_ADDR:-$(get_ip)}" - formatted_addr=$(format_ip_for_url "$public_ip") - echo "" - printf "${GREEN}Congratulations, Dokploy is installed!${NC}\n" - printf "${BLUE}Wait 15 seconds for the server to start${NC}\n" - printf "${YELLOW}Please go to http://${formatted_addr}:3000${NC}\n\n" -} - -update_dokploy() { - echo "Updating Dokploy..." - - # Pull the latest canary image - docker pull dokploy/dokploy:canary - - # Update the service - docker service update --image dokploy/dokploy:canary dokploy - - echo "Dokploy has been updated to the latest canary version." -} - -# Main script execution -if [ "$1" = "update" ]; then - update_dokploy -else - install_dokploy -fi diff --git a/apps/website/public/feature.sh b/apps/website/public/feature.sh deleted file mode 100644 index 6444b37..0000000 --- a/apps/website/public/feature.sh +++ /dev/null @@ -1,231 +0,0 @@ -#!/bin/bash -install_dokploy() { - if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" >&2 - exit 1 - fi - - # check if is Mac OS - if [ "$(uname)" = "Darwin" ]; then - echo "This script must be run on Linux" >&2 - exit 1 - fi - - # check if is running inside a container - if [ -f /.dockerenv ]; then - echo "This script must be run on Linux" >&2 - exit 1 - fi - - # check if something is running on port 80 - if ss -tulnp | grep ':80 ' >/dev/null; then - echo "Error: something is already running on port 80" >&2 - exit 1 - fi - - # check if something is running on port 443 - if ss -tulnp | grep ':443 ' >/dev/null; then - echo "Error: something is already running on port 443" >&2 - exit 1 - fi - - # check if something is running on port 3000 - if ss -tulnp | grep ':3000 ' >/dev/null; then - echo "Error: something is already running on port 3000" >&2 - echo "Dokploy requires port 3000 to be available. Please stop any service using this port." >&2 - exit 1 - fi - - command_exists() { - command -v "$@" > /dev/null 2>&1 - } - - if command_exists docker; then - echo "Docker already installed" - else - curl -sSL https://get.docker.com | sh -s -- --version 28.5.0 - fi - - docker swarm leave --force 2>/dev/null - - get_ip() { - local ip="" - - # Try IPv4 first - # First attempt: ifconfig.io - ip=$(curl -4s --connect-timeout 5 https://ifconfig.io 2>/dev/null) - - # Second attempt: icanhazip.com - if [ -z "$ip" ]; then - ip=$(curl -4s --connect-timeout 5 https://icanhazip.com 2>/dev/null) - fi - - # Third attempt: ipecho.net - if [ -z "$ip" ]; then - ip=$(curl -4s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null) - fi - - # If no IPv4, try IPv6 - if [ -z "$ip" ]; then - # Try IPv6 with ifconfig.io - ip=$(curl -6s --connect-timeout 5 https://ifconfig.io 2>/dev/null) - - # Try IPv6 with icanhazip.com - if [ -z "$ip" ]; then - ip=$(curl -6s --connect-timeout 5 https://icanhazip.com 2>/dev/null) - fi - - # Try IPv6 with ipecho.net - if [ -z "$ip" ]; then - ip=$(curl -6s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null) - fi - fi - - if [ -z "$ip" ]; then - echo "Error: Could not determine server IP address automatically (neither IPv4 nor IPv6)." >&2 - echo "Please set the ADVERTISE_ADDR environment variable manually." >&2 - echo "Example: export ADVERTISE_ADDR=" >&2 - exit 1 - fi - - echo "$ip" - } - - get_private_ip() { - ip addr show | grep -E "inet (192\.168\.|10\.|172\.1[6-9]\.|172\.2[0-9]\.|172\.3[0-1]\.)" | head -n1 | awk '{print $2}' | cut -d/ -f1 - } - - advertise_addr="${ADVERTISE_ADDR:-$(get_private_ip)}" - - if [ -z "$advertise_addr" ]; then - echo "ERROR: We couldn't find a private IP address." - echo "Please set the ADVERTISE_ADDR environment variable manually." - echo "Example: export ADVERTISE_ADDR=192.168.1.100" - exit 1 - fi - echo "Using advertise address: $advertise_addr" - - docker swarm init --advertise-addr $advertise_addr - - if [ $? -ne 0 ]; then - echo "Error: Failed to initialize Docker Swarm" >&2 - exit 1 - fi - - echo "Swarm initialized" - - docker network rm -f dokploy-network 2>/dev/null - docker network create --driver overlay --attachable dokploy-network - - echo "Network created" - - mkdir -p /etc/dokploy - - chmod 777 /etc/dokploy - - docker service create \ - --name dokploy-postgres \ - --constraint 'node.role==manager' \ - --network dokploy-network \ - --env POSTGRES_USER=dokploy \ - --env POSTGRES_DB=dokploy \ - --env POSTGRES_PASSWORD=amukds4wi9001583845717ad2 \ - --mount type=volume,source=dokploy-postgres,target=/var/lib/postgresql/data \ - postgres:16 - - - docker service create \ - --name dokploy-redis \ - --constraint 'node.role==manager' \ - --network dokploy-network \ - --mount type=volume,source=dokploy-redis,target=/data \ - redis:7 - - - # Installation - docker service create \ - --name dokploy \ - --replicas 1 \ - --network dokploy-network \ - --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \ - --mount type=bind,source=/etc/dokploy,target=/etc/dokploy \ - --mount type=volume,source=dokploy,target=/root/.docker \ - --publish published=3000,target=3000,mode=host \ - --update-parallelism 1 \ - --update-order stop-first \ - --constraint 'node.role == manager' \ - -e RELEASE_TAG=feature \ - -e ADVERTISE_ADDR=$advertise_addr \ - dokploy/dokploy:feature - - sleep 4 - - docker run -d \ - --name dokploy-traefik \ - --restart always \ - -v /etc/dokploy/traefik/traefik.yml:/etc/traefik/traefik.yml \ - -v /etc/dokploy/traefik/dynamic:/etc/dokploy/traefik/dynamic \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -p 80:80/tcp \ - -p 443:443/tcp \ - -p 443:443/udp \ - traefik:v3.6.1 - - docker network connect dokploy-network dokploy-traefik - - # Optional: Use docker service create instead of docker run - # docker service create \ - # --name dokploy-traefik \ - # --constraint 'node.role==manager' \ - # --network dokploy-network \ - # --mount type=bind,source=/etc/dokploy/traefik/traefik.yml,target=/etc/traefik/traefik.yml \ - # --mount type=bind,source=/etc/dokploy/traefik/dynamic,target=/etc/dokploy/traefik/dynamic \ - # --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \ - # --publish mode=host,published=443,target=443 \ - # --publish mode=host,published=80,target=80 \ - # --publish mode=host,published=443,target=443,protocol=udp \ - # traefik:v3.6.1 - - - GREEN="\033[0;32m" - YELLOW="\033[1;33m" - BLUE="\033[0;34m" - NC="\033[0m" # No Color - - format_ip_for_url() { - local ip="$1" - if echo "$ip" | grep -q ':'; then - # IPv6 - echo "[${ip}]" - else - # IPv4 - echo "${ip}" - fi - } - - public_ip="${ADVERTISE_ADDR:-$(get_ip)}" - formatted_addr=$(format_ip_for_url "$public_ip") - echo "" - printf "${GREEN}Congratulations, Dokploy is installed!${NC}\n" - printf "${BLUE}Wait 15 seconds for the server to start${NC}\n" - printf "${YELLOW}Please go to http://${formatted_addr}:3000${NC}\n\n" -} - -update_dokploy() { - echo "Updating Dokploy..." - - # Pull the latest feature image - docker pull dokploy/dokploy:feature - - # Update the service - docker service update --image dokploy/dokploy:feature dokploy - - echo "Dokploy has been updated to the latest feature version." -} - -# Main script execution -if [ "$1" = "update" ]; then - update_dokploy -else - install_dokploy -fi diff --git a/apps/website/public/install.sh b/apps/website/public/install.sh index a9920f3..bf01c5a 100644 --- a/apps/website/public/install.sh +++ b/apps/website/public/install.sh @@ -1,5 +1,14 @@ #!/bin/bash +# Detect version from environment variable or default to latest +# Usage: DOKPLOY_VERSION=canary bash install.sh +# Usage: DOKPLOY_VERSION=feature bash install.sh +# Usage: bash install.sh (defaults to latest) +detect_version() { + local version="${DOKPLOY_VERSION:-latest}" + echo "$version" +} + # Function to detect if running in Proxmox LXC container is_proxmox_lxc() { # Check for LXC in environment @@ -16,6 +25,11 @@ is_proxmox_lxc() { } install_dokploy() { + # Detect version tag + VERSION_TAG=$(detect_version) + DOCKER_IMAGE="dokploy/dokploy:${VERSION_TAG}" + + echo "Installing Dokploy version: ${VERSION_TAG}" if [ "$(id -u)" != "0" ]; then echo "This script must be run as root" >&2 exit 1 @@ -134,7 +148,17 @@ install_dokploy() { fi echo "Using advertise address: $advertise_addr" - docker swarm init --advertise-addr $advertise_addr + # Allow custom Docker Swarm init arguments via DOCKER_SWARM_INIT_ARGS environment variable + # Example: export DOCKER_SWARM_INIT_ARGS="--default-addr-pool 172.20.0.0/16 --default-addr-pool-mask-length 24" + # This is useful to avoid CIDR overlapping with cloud provider VPCs (e.g., AWS) + swarm_init_args="${DOCKER_SWARM_INIT_ARGS:-}" + + if [ -n "$swarm_init_args" ]; then + echo "Using custom swarm init arguments: $swarm_init_args" + docker swarm init --advertise-addr $advertise_addr $swarm_init_args + else + docker swarm init --advertise-addr $advertise_addr + fi if [ $? -ne 0 ]; then echo "Error: Failed to initialize Docker Swarm" >&2 @@ -170,6 +194,12 @@ install_dokploy() { redis:7 # Installation + # Set RELEASE_TAG environment variable for canary/feature versions + release_tag_env="" + if [ "$VERSION_TAG" != "latest" ]; then + release_tag_env="-e RELEASE_TAG=$VERSION_TAG" + fi + docker service create \ --name dokploy \ --replicas 1 \ @@ -182,8 +212,9 @@ install_dokploy() { --update-order stop-first \ --constraint 'node.role == manager' \ $endpoint_mode \ + $release_tag_env \ -e ADVERTISE_ADDR=$advertise_addr \ - dokploy/dokploy:latest + $DOCKER_IMAGE sleep 4 @@ -239,15 +270,19 @@ install_dokploy() { } update_dokploy() { - echo "Updating Dokploy..." + # Detect version tag + VERSION_TAG=$(detect_version) + DOCKER_IMAGE="dokploy/dokploy:${VERSION_TAG}" - # Pull the latest image - docker pull dokploy/dokploy:latest + echo "Updating Dokploy to version: ${VERSION_TAG}" + + # Pull the image + docker pull $DOCKER_IMAGE # Update the service - docker service update --image dokploy/dokploy:latest dokploy + docker service update --image $DOCKER_IMAGE dokploy - echo "Dokploy has been updated to the latest version." + echo "Dokploy has been updated to version: ${VERSION_TAG}" } # Main script execution