From cdcb40db5204734a1c7976bb35feeca67ce7f377 Mon Sep 17 00:00:00 2001 From: dragongoose Date: Tue, 13 Jun 2023 12:43:19 -0400 Subject: [PATCH] Docker support env var changes --- docker/Dockerfile | 6 +++--- substitute_environment_variables.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index bfac782..30c3485 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,9 +7,9 @@ FROM node:16 AS builder # Set working directory WORKDIR /app -ENV VITE_BACKEND_DOMAIN VITE_BACKEND_DOMAIN_PLACEHOLDER -ENV VITE_INSTANCE_DOMAIN VITE_INSTANCE_DOMAIN_PLACEHOLDER -ENV VITE_HTTPS VITE_HTTPS_PLACEHOLDER +ENV SAFETWITCH_BACKEND_DOMAIN SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER +ENV SAFETWITCH_INSTANCE_DOMAIN SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER +ENV SAFETWITCH_HTTPS SAFETWITCH_HTTPS_PLACEHOLDER # Copy all files from current directory to working dir in image COPY . . # install node modules and build assets diff --git a/substitute_environment_variables.sh b/substitute_environment_variables.sh index b71f4c4..38ef5bc 100755 --- a/substitute_environment_variables.sh +++ b/substitute_environment_variables.sh @@ -7,26 +7,26 @@ ROOT_DIR=/app if [ -f .env.old ]; then export $(echo $(cat .env.old | sed 's/#.*//g'| xargs) | envsubst) else - export VITE_BACKEND_DOMAIN_PLACEHOLDER=VITE_BACKEND_DOMAIN_PLACEHOLDER - export VITE_INSTANCE_DOMAIN_PLACEHOLDER=VITE_INSTANCE_DOMAIN_PLACEHOLDER - export VITE_HTTPS_PLACEHOLDER=VITE_HTTPS_PLACEHOLDER + export SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER + export SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER + export SAFETWITCH_HTTPS_PLACEHOLDER=SAFETWITCH_HTTPS_PLACEHOLDER fi -echo $VITE_BACKEND_DOMAIN_PLACEHOLDER +echo $SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER # Replace env vars in files served by NGINX for file in $ROOT_DIR/assets/*.js $ROOT_DIR/index.html; do - sed -i 's|'${VITE_BACKEND_DOMAIN_PLACEHOLDER}'|'${VITE_BACKEND_DOMAIN}'|g' $file - sed -i 's|'${VITE_INSTANCE_DOMAIN_PLACEHOLDER}'|'${VITE_INSTANCE_DOMAIN}'|g' $file - sed -i 's|'${VITE_HTTPS_PLACEHOLDER}'|'${VITE_HTTPS}'|g' $file + sed -i 's|'${SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_BACKEND_DOMAIN}'|g' $file + sed -i 's|'${SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER}'|'${SAFETWITCH_INSTANCE_DOMAIN}'|g' $file + sed -i 's|'${SAFETWITCH_HTTPS_PLACEHOLDER}'|'${SAFETWITCH_HTTPS}'|g' $file # Your other variables here... done # Save old variables -echo -e "VITE_BACKEND_DOMAIN_PLACEHOLDER=${VITE_BACKEND_DOMAIN}" > .env.old -echo -e "VITE_INSTANCE_DOMAIN_PLACEHOLDER=${VITE_INSTANCE_DOMAIN}" >> .env.old -echo -e "VITE_HTTPS_PLACEHOLDER=${VITE_HTTPS}" >> .env.old +echo -e "SAFETWITCH_BACKEND_DOMAIN_PLACEHOLDER=${SAFETWITCH_BACKEND_DOMAIN}" > .env.old +echo -e "SAFETWITCH_INSTANCE_DOMAIN_PLACEHOLDER=${SAFETWITCH_INSTANCE_DOMAIN}" >> .env.old +echo -e "SAFETWITCH_HTTPS_PLACEHOLDER=${SAFETWITCH_HTTPS}" >> .env.old # Starting NGINX nginx -g 'daemon off;' \ No newline at end of file