From e8545c2a66fc81d4c1af954b6bcba199202d023a Mon Sep 17 00:00:00 2001
From: Aleksander <170264518+t-aleksander@users.noreply.github.com>
Date: Thu, 30 Apr 2026 14:43:24 +0200
Subject: [PATCH 1/2] update tags

---
 docker-compose/docker-compose.yaml |  6 +++---
 docker-compose2.0/setup.sh         | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 4b32057..5eb30f1 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
   #     - "443:443"  # [PROXY]
 
   core:
-    image: ghcr.io/defguard/defguard:${CORE_IMAGE_TAG:-latest}
+    image: ghcr.io/defguard/defguard:${CORE_IMAGE_TAG:-1.6}
     restart: unless-stopped
     environment:
       DEFGUARD_AUTH_SECRET: ${DEFGUARD_AUTH_SECRET}
@@ -65,7 +65,7 @@ services:
       - ${VOLUME_DIR:-./.volumes}/core/rsakey.pem:/keys/rsakey.pem
 
   # proxy:  # [ENROLLMENT]
-  #   image: ghcr.io/defguard/defguard-proxy:${PROXY_IMAGE_TAG:-latest}  # [ENROLLMENT]
+  #   image: ghcr.io/defguard/defguard-proxy:${PROXY_IMAGE_TAG:-1.6}  # [ENROLLMENT]
   #   restart: unless-stopped  # [ENROLLMENT]
   #   environment:  # [ENROLLMENT]
   #     DEFGUARD_PROXY_GRPC_PORT: 50052  # [ENROLLMENT]
@@ -82,7 +82,7 @@ services:
   #     - core  # [ENROLLMENT]
 
   # gateway:  # [VPN]
-  #   image: ghcr.io/defguard/gateway:${GATEWAY_IMAGE_TAG:-latest}  # [VPN]
+  #   image: ghcr.io/defguard/gateway:${GATEWAY_IMAGE_TAG:-1.6}  # [VPN]
   #   restart: unless-stopped  # [VPN]
   #   network_mode: "host"  # [VPN]
   #   environment:  # [VPN]
diff --git a/docker-compose2.0/setup.sh b/docker-compose2.0/setup.sh
index b5f24b4..9db3938 100755
--- a/docker-compose2.0/setup.sh
+++ b/docker-compose2.0/setup.sh
@@ -15,10 +15,10 @@ COMPOSE_FILE="./docker-compose.yaml"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd || pwd)"
 COMPOSE_FILE_LOCAL="${SCRIPT_DIR}/docker-compose.yaml"
 
-DEFGUARD_CORE_TAG="pre-release"
-DEFGUARD_PROXY_TAG="pre-release"
-DEFGUARD_GATEWAY_TAG="pre-release"
-IMAGE_MODE="pre-release"
+DEFGUARD_CORE_TAG="2.0"
+DEFGUARD_PROXY_TAG="2.0"
+DEFGUARD_GATEWAY_TAG="2.0"
+IMAGE_MODE="2.0"
 
 check_character_support() {
   echo -e "$1" | grep -q "$1"
@@ -209,7 +209,7 @@ write_env() {
   case "$IMAGE_MODE" in
     dev)         info "Image mode: ${C_RED}development${C_END}" ;;
     pre-release) info "Image mode: ${C_YELLOW}pre-release${C_END}" ;;
-    *)           info "Image mode: ${C_GREEN}latest${C_END}" ;;
+    *)           info "Image mode: ${C_GREEN}latest 2.0${C_END}" ;;
   esac
 
   cat > .env << EOF

From 0fdc51177abca2f1195a8807c025b3f31cd30341 Mon Sep 17 00:00:00 2001
From: Aleksander <170264518+t-aleksander@users.noreply.github.com>
Date: Thu, 30 Apr 2026 14:45:33 +0200
Subject: [PATCH 2/2] Update setup.sh

---
 docker-compose2.0/setup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose2.0/setup.sh b/docker-compose2.0/setup.sh
index 9db3938..1bd66ad 100755
--- a/docker-compose2.0/setup.sh
+++ b/docker-compose2.0/setup.sh
@@ -15,10 +15,10 @@ COMPOSE_FILE="./docker-compose.yaml"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd || pwd)"
 COMPOSE_FILE_LOCAL="${SCRIPT_DIR}/docker-compose.yaml"
 
-DEFGUARD_CORE_TAG="2.0"
-DEFGUARD_PROXY_TAG="2.0"
-DEFGUARD_GATEWAY_TAG="2.0"
-IMAGE_MODE="2.0"
+DEFGUARD_CORE_TAG="2"
+DEFGUARD_PROXY_TAG="2"
+DEFGUARD_GATEWAY_TAG="2"
+IMAGE_MODE="2"
 
 check_character_support() {
   echo -e "$1" | grep -q "$1"