From 4fbfe82bc203fec5d9cef03a014184da9391e558 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Sun, 29 Jun 2025 11:05:57 +0200 Subject: [PATCH] pat from file --- .prettierignore | 1 + dockerfiles/login-lint.Dockerfile.dockerignore | 3 +++ dockerfiles/login-standalone.Dockerfile | 3 ++- dockerfiles/login-standalone.Dockerfile.dockerignore | 3 +++ dockerfiles/login-test-unit.Dockerfile.dockerignore | 3 +++ scripts/entrypoint.sh | 10 ++++++++++ 6 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 scripts/entrypoint.sh diff --git a/.prettierignore b/.prettierignore index a37ac4ff79..77415caa1e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,6 +2,7 @@ .changeset/ .github/ dist/ +standalone/ packages/zitadel-proto/google packages/zitadel-proto/protoc-gen-openapiv2 packages/zitadel-proto/validate diff --git a/dockerfiles/login-lint.Dockerfile.dockerignore b/dockerfiles/login-lint.Dockerfile.dockerignore index 91e1c4d0bc..1029f73c02 100644 --- a/dockerfiles/login-lint.Dockerfile.dockerignore +++ b/dockerfiles/login-lint.Dockerfile.dockerignore @@ -2,7 +2,10 @@ !apps/login apps/login/.next +apps/login/dist apps/login/screenshots +apps/login/standalone +apps/login/.env*.local !apps/login-test-integration diff --git a/dockerfiles/login-standalone.Dockerfile b/dockerfiles/login-standalone.Dockerfile index 1f52dd0efe..7e97d344db 100644 --- a/dockerfiles/login-standalone.Dockerfile +++ b/dockerfiles/login-standalone.Dockerfile @@ -20,6 +20,7 @@ RUN addgroup --system --gid 1001 nodejs && \ adduser --system --uid 1001 nextjs # If /.env-file/.env is mounted into the container, its variables are made available to the server before it starts up. RUN mkdir -p /.env-file && touch /.env-file/.env && chown -R nextjs:nodejs /.env-file +COPY ./scripts/entrypoint.sh ./ COPY ./scripts/healthcheck.js ./ COPY --chown=nextjs:nodejs --from=login-standalone-builder /build/docker/apps/login/.next/standalone ./ COPY --chown=nextjs:nodejs --from=login-standalone-builder /build/docker/apps/login/.next/static ./apps/login/.next/static @@ -30,4 +31,4 @@ ENV PORT=3000 # TODO: Check healthy, not ready HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ CMD ["/bin/sh", "-c", "node ./healthcheck.js http://localhost:${PORT}/ui/v2/login/healthy"] -CMD ["/bin/sh", "-c", "set -o allexport && . /.env-file/.env && set +o allexport && node apps/login/server.js"] +ENTRYPOINT ["./entrypoint.sh"] diff --git a/dockerfiles/login-standalone.Dockerfile.dockerignore b/dockerfiles/login-standalone.Dockerfile.dockerignore index 7a2813164c..f876e1e9f1 100644 --- a/dockerfiles/login-standalone.Dockerfile.dockerignore +++ b/dockerfiles/login-standalone.Dockerfile.dockerignore @@ -3,8 +3,11 @@ !apps/login apps/login/.next apps/login/dist +apps/login/screenshots +apps/login/standalone apps/login/.env*.local +!scripts/entrypoint.sh !scripts/healthcheck.js !packages/zitadel-tailwind-config diff --git a/dockerfiles/login-test-unit.Dockerfile.dockerignore b/dockerfiles/login-test-unit.Dockerfile.dockerignore index dafe894b42..2263653c69 100644 --- a/dockerfiles/login-test-unit.Dockerfile.dockerignore +++ b/dockerfiles/login-test-unit.Dockerfile.dockerignore @@ -2,7 +2,10 @@ !apps/login apps/login/.next +apps/login/dist apps/login/screenshots +apps/login/standalone +apps/login/.env*.local **/*.md **/*.png diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh new file mode 100755 index 0000000000..1fcd7a98f2 --- /dev/null +++ b/scripts/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -o allexport +. /.env-file/.env +set +o allexport + +if [ -n "${ZITADEL_SERVICE_USER_TOKEN_PATH}" ] && [ -f "${ZITADEL_SERVICE_USER_TOKEN_PATH}" ]; then + export ZITADEL_SERVICE_USER_TOKEN=$(cat "${ZITADEL_SERVICE_USER_TOKEN_PATH}") +fi + +exec node apps/login/server.js