From 6157f3e159847cbb0f0a12226edaf08814e86b3d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Wed, 20 Apr 2022 11:58:24 -0400 Subject: [PATCH 1/2] remove unnecessary docker env files --- quickstart/docker/all.localhost.env | 3 --- quickstart/docker/default.env | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 quickstart/docker/all.localhost.env delete mode 100644 quickstart/docker/default.env diff --git a/quickstart/docker/all.localhost.env b/quickstart/docker/all.localhost.env deleted file mode 100644 index 482f78eb9..000000000 --- a/quickstart/docker/all.localhost.env +++ /dev/null @@ -1,3 +0,0 @@ -ZITI_CONTROLLER_RAWNAME=localhost -ZITI_EDGE_CONTROLLER_RAWNAME=localhost -ZITI_ZAC_RAWNAME=localhost diff --git a/quickstart/docker/default.env b/quickstart/docker/default.env deleted file mode 100644 index 1c8441c14..000000000 --- a/quickstart/docker/default.env +++ /dev/null @@ -1,3 +0,0 @@ -ZITI_CONTROLLER_RAWNAME=ziti-controller -ZITI_EDGE_CONTROLLER_RAWNAME=ziti-edge-controller -ZITI_ZAC_RAWNAME=ziti-zac From a42553fa1c5eb03e41fe9febd919c74d72cd5030 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 21 Apr 2022 06:42:00 -0400 Subject: [PATCH 2/2] call out that .env is used (replaces default.env) --- quickstart/docker/docker-compose.yml | 2 +- quickstart/docker/simplified-docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml index c4d3631ac..65d3b830a 100644 --- a/quickstart/docker/docker-compose.yml +++ b/quickstart/docker/docker-compose.yml @@ -3,7 +3,7 @@ services: ziti-controller: image: "${ZITI_IMAGE}:${ZITI_VERSION}" env_file: - - ./default.env + - ./.env ports: - "1280:1280" networks: diff --git a/quickstart/docker/simplified-docker-compose.yml b/quickstart/docker/simplified-docker-compose.yml index 7646adef9..5fbbe7ada 100644 --- a/quickstart/docker/simplified-docker-compose.yml +++ b/quickstart/docker/simplified-docker-compose.yml @@ -3,7 +3,7 @@ services: ziti-controller: image: "${ZITI_IMAGE}:${ZITI_VERSION}" env_file: - - ./default.env + - ./.env ports: - "1280:1280" networks: