From 8033d618c1de16bccfc1a72fe4680f9581f96dcf Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Wed, 1 Feb 2023 18:23:46 -0600
Subject: [PATCH] Expose phoenix and Wireguard ports specified in configuration
 (#1372)

---
 docker-compose.desktop.yml | 10 ++++------
 docker-compose.prod.yml    |  6 +++---
 rel/overlays/bin/gen-env   |  1 +
 scripts/install.sh         |  3 +++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docker-compose.desktop.yml b/docker-compose.desktop.yml
index 80fc37f73..5da815f9e 100644
--- a/docker-compose.desktop.yml
+++ b/docker-compose.desktop.yml
@@ -35,19 +35,17 @@ services:
 
         https:// {
           log
-          reverse_proxy * firezone:13000
-          tls internal {
-            on_demand
-          }
+          reverse_proxy * 172.25.0.100:${PHOENIX_PORT:-13000}
+          ${TLS_OPTS:-}
         }
         EOF
     deploy:
       <<: *default-deploy
 
   firezone:
-    image: firezone/firezone
+    image: firezone/firezone:${VERSION:-latest}
     ports:
-      - 51820:51820/udp
+      - ${WIREGUARD_PORT:-51820}:${WIREGUARD_PORT:-51820}/udp
     env_file:
       # This should contain a list of env vars for configuring Firezone.
       # See https://docs.firezone.dev/reference/env-vars for more info.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 9d190b090..119bb0684 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -31,7 +31,7 @@ services:
 
         https:// {
           log
-          reverse_proxy * 172.25.0.100:13000
+          reverse_proxy * 172.25.0.100:${PHOENIX_PORT:-13000}
           ${TLS_OPTS:-}
         }
         EOF
@@ -40,9 +40,9 @@ services:
       <<: *default-deploy
 
   firezone:
-    image: firezone/firezone
+    image: firezone/firezone:${VERSION:-latest}
     ports:
-      - 51820:51820/udp
+      - ${WIREGUARD_PORT:-51820}:${WIREGUARD_PORT:-51820}/udp
     env_file:
       # This should contain a list of env vars for configuring Firezone.
       # See https://docs.firezone.dev/reference/env-vars for more info.
diff --git a/rel/overlays/bin/gen-env b/rel/overlays/bin/gen-env
index 2b21eebb0..b5be7ed13 100755
--- a/rel/overlays/bin/gen-env
+++ b/rel/overlays/bin/gen-env
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cat <<-EOF
+VERSION=latest
 EXTERNAL_URL=_CHANGE_ME_
 ADMIN_EMAIL=_CHANGE_ME_
 DEFAULT_ADMIN_PASSWORD=$(openssl rand -base64 12)
diff --git a/scripts/install.sh b/scripts/install.sh
index c1d5c7ba9..8f7230d82 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -149,6 +149,9 @@ firezoneSetup() {
   echo "TELEMETRY_ENABLED=$telemEnabled" >> "$installDir/.env"
   echo "TID=$tid" >> "$installDir/.env"
 
+  LATEST_VERSION=$(curl -fsSL https://api.github.com/repos/firezone/firezone/releases/latest | grep -w tag_name | cut -d '"' -f 4)
+  sed -i.bak "s~VERSION=.*~VERSION=${LATEST_VERSION}~" "$installDir/.env"
+
   # XXX: This causes perms issues on macOS with postgres
   # echo "UID=$(id -u)" >> $installDir/.env
   # echo "GID=$(id -g)" >> $installDir/.env