From 808a901aee4d7e325fa440e394613873d84d7e62 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 6 Jan 2025 12:34:16 +0530 Subject: [PATCH] feat: updated env in docker files --- Dockerfile.fips.standalone-infisical | 23 ++++++++--------------- Dockerfile.standalone-infisical | 20 ++++++++------------ standalone-entrypoint.sh | 5 ----- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/Dockerfile.fips.standalone-infisical b/Dockerfile.fips.standalone-infisical index 753fe301b5..8bca916b7b 100644 --- a/Dockerfile.fips.standalone-infisical +++ b/Dockerfile.fips.standalone-infisical @@ -24,15 +24,15 @@ COPY /frontend . ENV NODE_ENV production ARG POSTHOG_HOST -ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST +ENV VITE_POSTHOG_HOST $POSTHOG_HOST ARG POSTHOG_API_KEY -ENV NEXT_PUBLIC_POSTHOG_API_KEY $POSTHOG_API_KEY +ENV VITE_POSTHOG_API_KEY $POSTHOG_API_KEY ARG INTERCOM_ID -ENV NEXT_PUBLIC_INTERCOM_ID $INTERCOM_ID +ENV VITE_INTERCOM_ID $INTERCOM_ID ARG INFISICAL_PLATFORM_VERSION -ENV NEXT_PUBLIC_INFISICAL_PLATFORM_VERSION $INFISICAL_PLATFORM_VERSION +ENV VITE_INFISICAL_PLATFORM_VERSION $INFISICAL_PLATFORM_VERSION ARG CAPTCHA_SITE_KEY -ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY $CAPTCHA_SITE_KEY +ENV VITE_CAPTCHA_SITE_KEY $CAPTCHA_SITE_KEY # Build RUN npm run build @@ -43,12 +43,8 @@ WORKDIR /app RUN groupadd -r -g 1001 nodejs && useradd -r -u 1001 -g nodejs non-root-user -COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./ -COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/standalone ./ -COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/static ./.next/static - USER non-root-user ## @@ -153,14 +149,11 @@ RUN chmod u+rx /usr/sbin/update-ca-certificates ## set pre baked keys ARG POSTHOG_API_KEY -ENV NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY \ - BAKED_NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY +ENV POSTHOG_API_KEY=$POSTHOG_API_KEY ARG INTERCOM_ID=intercom-id -ENV NEXT_PUBLIC_INTERCOM_ID=$INTERCOM_ID \ - BAKED_NEXT_PUBLIC_INTERCOM_ID=$INTERCOM_ID +ENV INTERCOM_ID=$INTERCOM_ID ARG CAPTCHA_SITE_KEY -ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY \ - BAKED_NEXT_PUBLIC_CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY +ENV CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY WORKDIR / diff --git a/Dockerfile.standalone-infisical b/Dockerfile.standalone-infisical index b4e42679db..ed9e878168 100644 --- a/Dockerfile.standalone-infisical +++ b/Dockerfile.standalone-infisical @@ -28,15 +28,15 @@ COPY /frontend . ENV NODE_ENV production ARG POSTHOG_HOST -ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST +ENV VITE_POSTHOG_HOST $POSTHOG_HOST ARG POSTHOG_API_KEY -ENV NEXT_PUBLIC_POSTHOG_API_KEY $POSTHOG_API_KEY +ENV VITE_POSTHOG_API_KEY $POSTHOG_API_KEY ARG INTERCOM_ID -ENV NEXT_PUBLIC_INTERCOM_ID $INTERCOM_ID +ENV VITE_INTERCOM_ID $INTERCOM_ID ARG INFISICAL_PLATFORM_VERSION -ENV NEXT_PUBLIC_INFISICAL_PLATFORM_VERSION $INFISICAL_PLATFORM_VERSION +ENV VITE_INFISICAL_PLATFORM_VERSION $INFISICAL_PLATFORM_VERSION ARG CAPTCHA_SITE_KEY -ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY $CAPTCHA_SITE_KEY +ENV VITE_CAPTCHA_SITE_KEY $CAPTCHA_SITE_KEY # Build RUN npm run build @@ -48,7 +48,6 @@ WORKDIR /app RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 non-root-user -COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./ USER non-root-user @@ -149,14 +148,11 @@ RUN chmod u+rx /usr/sbin/update-ca-certificates ## set pre baked keys ARG POSTHOG_API_KEY -ENV NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY \ - BAKED_NEXT_PUBLIC_POSTHOG_API_KEY=$POSTHOG_API_KEY +ENV POSTHOG_API_KEY=$POSTHOG_API_KEY ARG INTERCOM_ID=intercom-id -ENV NEXT_PUBLIC_INTERCOM_ID=$INTERCOM_ID \ - BAKED_NEXT_PUBLIC_INTERCOM_ID=$INTERCOM_ID +ENV INTERCOM_ID=$INTERCOM_ID ARG CAPTCHA_SITE_KEY -ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY \ - BAKED_NEXT_PUBLIC_CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY +ENV CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY COPY --from=backend-runner /app /backend diff --git a/standalone-entrypoint.sh b/standalone-entrypoint.sh index 783ce6a8e7..7aa8712ef4 100755 --- a/standalone-entrypoint.sh +++ b/standalone-entrypoint.sh @@ -2,9 +2,4 @@ update-ca-certificates -cd frontend-build -scripts/initialize-standalone-build.sh - -cd ../ - exec node --enable-source-maps dist/main.mjs