From 7ba125ffcb2ff3cd727335de1e01308114da0add Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 27 Jun 2023 15:23:27 -0400 Subject: [PATCH] small tweak to Dockerfile --- quickstart/docker/image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile index f2ee94754..a07c8e14e 100644 --- a/quickstart/docker/image/Dockerfile +++ b/quickstart/docker/image/Dockerfile @@ -24,7 +24,7 @@ WORKDIR /persistent ENV ZITI_HOME=/persistent ENV ZITI_SHARED="${ZITI_HOME}/shared" -ENV ENV_FILE="${ZITI_HOME}/ziti.env" +ENV ZITI_ENV_FILE="${ZITI_HOME}/ziti.env" ENV ZITI_NETWORK=ziti # Don't put these paths on shared volume in docker-compose deployment (https://github.com/openziti/ziti/issues/912) ENV ZITI_BIN_DIR=/var/openziti/ziti-bin @@ -40,4 +40,4 @@ COPY --chown=ziti run-with-ziti-cli.sh "${ZITI_SCRIPTS}/" COPY --chown=ziti access-control.sh "${ZITI_SCRIPTS}/" COPY --chown=ziti run-router-external.sh "${ZITI_SCRIPTS}/" -RUN /bin/bash -c "source ${ZITI_SCRIPTS}/ziti-cli-functions.sh; echo source ${ZITI_HOME}/ziti.env >> ~/.bashrc" +RUN /bin/bash -c "source ${ZITI_SCRIPTS}/ziti-cli-functions.sh; persistEnvironmentValues; echo source ${ZITI_HOME}/ziti.env >> ~/.bashrc"