From 39d48aadb5743ca2df84530674fdfed616970921 Mon Sep 17 00:00:00 2001 From: Jamil Date: Sat, 22 Oct 2022 08:27:02 -0700 Subject: [PATCH] Don't accidentally swallow script errors (#1052) * Don't accidentally swallow script errors * add docs --- docker-compose.prod.yml | 2 ++ scripts/install.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index a3d639bb1..2823d1afc 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -25,6 +25,8 @@ services: ports: - 80:80 - 443:443 + # See Caddy's documentation for customizing this line + # https://caddyserver.com/docs/quick-starts/reverse-proxy command: caddy reverse-proxy --to firezone:13000 --from ${EXTERNAL_URL:?err} ${CADDY_OPTS} deploy: <<: *default-deploy diff --git a/scripts/install.sh b/scripts/install.sh index 7f889d837..860538109 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -13,13 +13,14 @@ dockerCheck () { dc="docker compose" fi - + set +e $dc version | grep -q "v2" if [ $? -ne 0 ]; then echo "Error: Automatic installation is only supported with Docker Compose version 2 or higher." echo "Please upgrade Docker Compose or use the manual installation method: https://docs.firezone.dev/deploy/docker" exit 1 fi + set -e } curlCheck () { if ! type curl > /dev/null; then