From e1eb84967992cc66e4f3a3d276361e7927b9e8e6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 5 Jan 2022 11:24:41 +0200 Subject: [PATCH] Attempt at dynamic env vars, thanx TheBestMoshe https://github.com/calendso/docker/commit/b5b0eb5a97cb2ec6ebea3fadc4108e23bb102515 --- Dockerfile | 8 +++----- scripts/start.sh | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7901afe..1f7f452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,8 @@ RUN yarn install --frozen-lockfile FROM node:14 as builder WORKDIR /app -ARG BASE_URL -ENV BASE_URL $BASE_URL -ARG NEXT_PUBLIC_APP_URL -ENV NEXT_PUBLIC_APP_URL $NEXT_PUBLIC_APP_URL +ENV BASE_URL=APP_BASE_URL_VAR +ENV NEXT_PUBLIC_APP_URL=APP_NEXT_PUBLIC_APP_URL_VAR COPY calendso . @@ -30,7 +28,7 @@ COPY --from=builder /app/next-i18next.config.js ./ COPY --from=builder /app/public ./public COPY --from=builder /app/.next ./.next COPY --from=builder /app/package.json ./package.json -COPY scripts scripts +COPY scripts scripts EXPOSE 3000 CMD ["/app/scripts/start.sh"] diff --git a/scripts/start.sh b/scripts/start.sh index dc84684..37315f7 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,6 +1,12 @@ #!/bin/sh set -x +# Set environment variables +echo BASE_URL $BASE_URL +echo NEXT_PUBLIC_APP_URL "$NEXT_PUBLIC_APP_URL" +find \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_APP_URL_VAR#$NEXT_PUBLIC_APP_URL#g" +find \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_BASE_URL_VAR#$BASE_URL#g" + /app/scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up" npx prisma migrate deploy yarn start