From 882af30047e7f8d9463cea782e9283565ba3de7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20W=C3=B3jcik?= Date: Fri, 22 May 2026 09:24:19 +0200 Subject: [PATCH 1/2] change docker compose tag to 2 --- docker-compose2.0/docker-compose.firewall.yaml | 6 +++--- docker-compose2.0/docker-compose.ha.yaml | 10 +++++----- docker-compose2.0/docker-compose.ldap.yaml | 6 +++--- docker-compose2.0/docker-compose.yaml | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker-compose2.0/docker-compose.firewall.yaml b/docker-compose2.0/docker-compose.firewall.yaml index 2f4e196..d528358 100644 --- a/docker-compose2.0/docker-compose.firewall.yaml +++ b/docker-compose2.0/docker-compose.firewall.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard:2.0.0 + image: ghcr.io/defguard/defguard:2 environment: DEFGUARD_COOKIE_INSECURE: "true" DEFGUARD_DB_HOST: db @@ -21,7 +21,7 @@ services: - default edge1: - image: ghcr.io/defguard/defguard-proxy:2.0.0 + image: ghcr.io/defguard/defguard-proxy:2 volumes: - ./.volumes/certs2.0/edge1:/etc/defguard/certs ports: @@ -32,7 +32,7 @@ services: - default gateway1: - image: ghcr.io/defguard/gateway:2.0.1 + image: ghcr.io/defguard/gateway:2 cap_add: - NET_ADMIN volumes: diff --git a/docker-compose2.0/docker-compose.ha.yaml b/docker-compose2.0/docker-compose.ha.yaml index cd8b9bc..651c601 100644 --- a/docker-compose2.0/docker-compose.ha.yaml +++ b/docker-compose2.0/docker-compose.ha.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard:2.0.0 + image: ghcr.io/defguard/defguard:2 environment: DEFGUARD_COOKIE_INSECURE: "true" DEFGUARD_DB_HOST: db @@ -18,12 +18,12 @@ services: - "8000:8000" edge1: - image: ghcr.io/defguard/defguard-proxy:2.0.0 + image: ghcr.io/defguard/defguard-proxy:2 volumes: - ./.volumes/certs2.0-ha/edge1:/etc/defguard/certs edge2: - image: ghcr.io/defguard/defguard-proxy:2.0.0 + image: ghcr.io/defguard/defguard-proxy:2 volumes: - ./.volumes/certs2.0-ha/edge2:/etc/defguard/certs @@ -38,7 +38,7 @@ services: - ./nginx/edge.conf:/etc/nginx/conf.d/default.conf:ro gateway1: - image: ghcr.io/defguard/gateway:2.0.1 + image: ghcr.io/defguard/gateway:2 cap_add: - NET_ADMIN volumes: @@ -48,7 +48,7 @@ services: HEALTH_PORT: 55003 gateway2: - image: ghcr.io/defguard/gateway:2.0.1 + image: ghcr.io/defguard/gateway:2 cap_add: - NET_ADMIN volumes: diff --git a/docker-compose2.0/docker-compose.ldap.yaml b/docker-compose2.0/docker-compose.ldap.yaml index b15280f..78f8a19 100644 --- a/docker-compose2.0/docker-compose.ldap.yaml +++ b/docker-compose2.0/docker-compose.ldap.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard:2.0.0 + image: ghcr.io/defguard/defguard:2 environment: DEFGUARD_COOKIE_INSECURE: "true" DEFGUARD_DB_HOST: db @@ -18,7 +18,7 @@ services: - "8000:8000" edge1: - image: ghcr.io/defguard/defguard-proxy:2.0.0 + image: ghcr.io/defguard/defguard-proxy:2 volumes: - ./.volumes/certs2.0/edge1:/etc/defguard/certs ports: @@ -27,7 +27,7 @@ services: - "443:443" gateway1: - image: ghcr.io/defguard/gateway:2.0.1 + image: ghcr.io/defguard/gateway:2 cap_add: - NET_ADMIN volumes: diff --git a/docker-compose2.0/docker-compose.yaml b/docker-compose2.0/docker-compose.yaml index ae24c5d..c2344e5 100644 --- a/docker-compose2.0/docker-compose.yaml +++ b/docker-compose2.0/docker-compose.yaml @@ -1,6 +1,6 @@ services: core: - image: ghcr.io/defguard/defguard:2.0.0 + image: ghcr.io/defguard/defguard:2 environment: DEFGUARD_COOKIE_INSECURE: "true" DEFGUARD_DB_HOST: db @@ -18,7 +18,7 @@ services: - "8000:8000" edge1: - image: ghcr.io/defguard/defguard-proxy:2.0.0 + image: ghcr.io/defguard/defguard-proxy:2 volumes: - ./.volumes/certs2.0/edge1:/etc/defguard/certs ports: @@ -27,7 +27,7 @@ services: - "443:443" gateway1: - image: ghcr.io/defguard/gateway:2.0.1 + image: ghcr.io/defguard/gateway:2 cap_add: - NET_ADMIN volumes: From 1fe971afe8efb865270fd6a18eb40fbe976562e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20W=C3=B3jcik?= Date: Fri, 22 May 2026 09:27:47 +0200 Subject: [PATCH 2/2] remove ova script --- ova/build-ova.sh | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 ova/build-ova.sh diff --git a/ova/build-ova.sh b/ova/build-ova.sh deleted file mode 100644 index 24acfe5..0000000 --- a/ova/build-ova.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -euo pipefail - -TAG="2.0.0-alpha2" -ISO_PATH="${PWD}/ubuntu-24.04.4-live-server-amd64.iso" - -if [ ! -f "$ISO_PATH" ]; then - echo "Missing ISO: $ISO_PATH" >&2 - echo "Download it first with:" >&2 - echo " curl -fL -o ubuntu-24.04.4-live-server-amd64.iso https://releases.ubuntu.com/24.04.4/ubuntu-24.04.4-live-server-amd64.iso" >&2 - exit 1 -fi - -packer init defguard.pkr.hcl - -packer build \ - -var "iso_url=file://$ISO_PATH" \ - -var "core_tag=$TAG" \ - -var "proxy_tag=$TAG" \ - -var "gateway_tag=$TAG" \ - defguard.pkr.hcl