diff --git a/dockerfiles/login.Dockerfile b/dockerfiles/login.Dockerfile index 03990894a3..ad9163285f 100644 --- a/dockerfiles/login.Dockerfile +++ b/dockerfiles/login.Dockerfile @@ -13,7 +13,7 @@ RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm fetch - --filter @zitadel/client \ --filter @zitadel/proto COPY package.json ./ -COPY apps/login/apps/login/package.json ./apps/login/apps/login/package.json +COPY apps/login/package.json ./apps/login/package.json COPY packages/zitadel-proto/package.json ./packages/zitadel-proto/package.json COPY packages/zitadel-client/package.json ./packages/zitadel-client/package.json RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --frozen-lockfile \ @@ -24,9 +24,9 @@ COPY . . RUN pnpm turbo build:login:standalone FROM scratch AS build-out -COPY --from=build /app/apps/login/apps/login/.next/standalone / -COPY --from=build /app/apps/login/apps/login/.next/static /.next/static -COPY --from=build /app/apps/login/apps/login/public /public +COPY --from=build /app/apps/login/.next/standalone / +COPY --from=build /app/apps/login/.next/static /.next/static +COPY --from=build /app/apps/login/public /public FROM base AS login-standalone WORKDIR /runtime @@ -34,12 +34,12 @@ 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 apps/login/apps/login/scripts ./ +COPY apps/login/scripts ./ COPY --chown=nextjs:nodejs --from=build-out . . USER nextjs ENV HOSTNAME="0.0.0.0" 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", "node ./healthcheck.js http://localhost:${PORT}/ui/v2/login/healthy"] ENTRYPOINT ["./entrypoint.sh"] diff --git a/dockerfiles/login.Dockerfile.dockerignore b/dockerfiles/login.Dockerfile.dockerignore index 08d014d47e..2070cf5982 100644 --- a/dockerfiles/login.Dockerfile.dockerignore +++ b/dockerfiles/login.Dockerfile.dockerignore @@ -1,17 +1,17 @@ * -!apps/login/apps/login/constants -!apps/login/apps/login/scripts -!apps/login/apps/login/src -!apps/login/apps/login/public -!apps/login/apps/login/locales -!apps/login/apps/login/next.config.mjs -!apps/login/apps/login/next-env-vars.d.ts -!apps/login/apps/login/next-env.d.ts -!apps/login/apps/login/tailwind.config.js -!apps/login/apps/login/tsconfig.json -!apps/login/apps/login/package.json -!apps/login/apps/login/turbo.json +!apps/login/constants +!apps/login/scripts +!apps/login/src +!apps/login/public +!apps/login/locales +!apps/login/next.config.mjs +!apps/login/next-env-vars.d.ts +!apps/login/next-env.d.ts +!apps/login/tailwind.config.js +!apps/login/tsconfig.json +!apps/login/package.json +!apps/login/turbo.json !package.json !pnpm-lock.yaml