From de96926bcb67c9bfccc2c2650f4dd27a1593e2de Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sun, 8 Oct 2023 09:41:36 +0200 Subject: [PATCH] chore: tiny fix --- .deploy/webapp/entrypoint.compose.sh | 3 ++- .deploy/webapp/entrypoint.prod.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.deploy/webapp/entrypoint.compose.sh b/.deploy/webapp/entrypoint.compose.sh index 8fc19c4d60f..4d01f8f02af 100644 --- a/.deploy/webapp/entrypoint.compose.sh +++ b/.deploy/webapp/entrypoint.compose.sh @@ -31,10 +31,11 @@ sed -i "s#DOCKER_GAUZY_GITHUB_CLIENT_ID#$GAUZY_GITHUB_CLIENT_ID#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_APP_NAME#$GAUZY_GITHUB_APP_NAME#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_REDIRECT_URL#$GAUZY_GITHUB_REDIRECT_URL#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_APP_ID#$GAUZY_GITHUB_APP_ID#g" *.js -sed -i "s#DOCKER_GAUZY_GITHUB_POST_INSTALL_URL#$GAUZY_GITHUB_POST_INSTALL_URL#g" *.js +sed -i "s|DOCKER_GAUZY_GITHUB_POST_INSTALL_URL|$GAUZY_GITHUB_POST_INSTALL_URL|g" *.js sed -i "s#DOCKER_JITSU_BROWSER_URL#$JITSU_BROWSER_URL#g" *.js sed -i "s#DOCKER_JITSU_BROWSER_WRITE_KEY#$JITSU_BROWSER_WRITE_KEY#g" *.js +# We need to copy nginx.conf to correct place envsubst '${API_HOST} ${API_PORT}' < /etc/nginx/conf.d/compose.conf.template > /etc/nginx/nginx.conf # In Docker Compose we should wait other services start diff --git a/.deploy/webapp/entrypoint.prod.sh b/.deploy/webapp/entrypoint.prod.sh index 3d1b82e1fd0..0663b5eece1 100755 --- a/.deploy/webapp/entrypoint.prod.sh +++ b/.deploy/webapp/entrypoint.prod.sh @@ -29,7 +29,7 @@ sed -i "s#DOCKER_GAUZY_GITHUB_CLIENT_ID#$GAUZY_GITHUB_CLIENT_ID#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_APP_NAME#$GAUZY_GITHUB_APP_NAME#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_REDIRECT_URL#$GAUZY_GITHUB_REDIRECT_URL#g" *.js sed -i "s#DOCKER_GAUZY_GITHUB_APP_ID#$GAUZY_GITHUB_APP_ID#g" *.js -sed -i "s#DOCKER_GAUZY_GITHUB_POST_INSTALL_URL#$GAUZY_GITHUB_POST_INSTALL_URL#g" *.js +sed -i "s|DOCKER_GAUZY_GITHUB_POST_INSTALL_URL|$GAUZY_GITHUB_POST_INSTALL_URL|g" *.js sed -i "s#DOCKER_JITSU_BROWSER_URL#$JITSU_BROWSER_URL#g" *.js sed -i "s#DOCKER_JITSU_BROWSER_WRITE_KEY#$JITSU_BROWSER_WRITE_KEY#g" *.js