diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index e1493cfcff..0c36624a46 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -77,6 +77,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: executables + pattern: 'zitadel-*-*' - name: move files one folder up run: mv */*.tar.gz . && find . -type d -empty -delete working-directory: executables diff --git a/.github/workflows/login-container.yml b/.github/workflows/login-container.yml index 4e78ba68cd..e9a0b97648 100644 --- a/.github/workflows/login-container.yml +++ b/.github/workflows/login-container.yml @@ -55,6 +55,7 @@ jobs: env: NODE_VERSION: ${{ inputs.node_version }} with: + source: . push: true provenance: true sbom: true diff --git a/.golangci.yaml b/.golangci.yaml index 712df7d33d..cde08dcf41 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -100,9 +100,7 @@ linters: - .keys - .vscode - build - - console - deploy - - docs - guides - internal/api/ui/login/static - openapi @@ -111,6 +109,12 @@ linters: - third_party$ - builtin$ - examples$ + - apps + - packages + - console + - docs + - load-test + issues: max-issues-per-linter: 0 max-same-issues: 0 @@ -135,9 +139,7 @@ formatters: - .keys - .vscode - build - - console - deploy - - docs - guides - internal/api/ui/login/static - openapi @@ -146,3 +148,8 @@ formatters: - third_party$ - builtin$ - examples$ + - apps + - packages + - console + - docs + - load-test diff --git a/apps/login/scripts/entrypoint.sh b/apps/login/scripts/entrypoint.sh index 123612d1cb..5bafc0012d 100755 --- a/apps/login/scripts/entrypoint.sh +++ b/apps/login/scripts/entrypoint.sh @@ -8,6 +8,4 @@ if [ -n "${ZITADEL_SERVICE_USER_TOKEN_FILE}" ] && [ -f "${ZITADEL_SERVICE_USER_T export ZITADEL_SERVICE_USER_TOKEN=$(cat "${ZITADEL_SERVICE_USER_TOKEN_FILE}") fi - - -exec node /runtime/apps/login/apps/login/server.js +exec node /runtime/apps/login/server.js diff --git a/build/login/Dockerfile b/build/login/Dockerfile index ad9163285f..cd75728738 100644 --- a/build/login/Dockerfile +++ b/build/login/Dockerfile @@ -24,9 +24,9 @@ COPY . . RUN pnpm turbo build:login:standalone FROM scratch AS build-out -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 +COPY /apps/login/public ./apps/login/public +COPY --from=build /app/apps/login/.next/standalone ./ +COPY --from=build /app/apps/login/.next/static ./apps/login/.next/static FROM base AS login-standalone WORKDIR /runtime @@ -34,7 +34,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 apps/login/scripts ./ +COPY --chown=nextjs:nodejs apps/login/scripts ./ COPY --chown=nextjs:nodejs --from=build-out . . USER nextjs ENV HOSTNAME="0.0.0.0" diff --git a/build/login/.dockerignore b/build/login/Dockerfile.dockerignore similarity index 80% rename from build/login/.dockerignore rename to build/login/Dockerfile.dockerignore index 2070cf5982..c2a0ee4a18 100644 --- a/build/login/.dockerignore +++ b/build/login/Dockerfile.dockerignore @@ -8,7 +8,8 @@ !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/tailwind.config.mjs +!apps/login/postcss.config.cjs !apps/login/tsconfig.json !apps/login/package.json !apps/login/turbo.json @@ -23,6 +24,7 @@ !packages/zitadel-proto/turbo.json !packages/zitadel-client/package.json +!packages/zitadel-client/**/package.json !packages/zitadel-client/src !packages/zitadel-client/tsconfig.json !packages/zitadel-client/tsup.config.ts @@ -30,8 +32,7 @@ !proto -*.md -*.png -node_modules -*.test.ts -*.test.tsx +**/*.md +**/node_modules +**/*.test.ts +**/*.test.tsx