From 8ca26d69a7194e2c0d040d2e0d402b7b51906284 Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Fri, 25 Jul 2025 01:00:36 +0200 Subject: [PATCH] fix runs and contexts --- .devcontainer/base/.dockerignore | 3 --- .devcontainer/base/Dockerfile | 12 ++++++++---- .devcontainer/base/Dockerfile.dockerignore | 4 ++++ .devcontainer/base/devcontainer.json | 2 +- .../login-integration-debug/devcontainer.json | 13 +++---------- .../login-integration/devcontainer.json | 10 ++-------- .../turbo-lint-unit-debug/devcontainer.json | 10 ++-------- .../turbo-lint-unit/devcontainer.json | 10 ++-------- ...{.dockerignore => Dockerfile.dockerignore} | 0 apps/login/acceptance/package.json | 19 ------------------- apps/login/package.json | 2 +- build/login/Dockerfile | 6 ++++-- ...{.dockerignore => Dockerfile.dockerignore} | 0 ...{.dockerignore => Dockerfile.dockerignore} | 0 package.json | 3 ++- pnpm-lock.yaml | 3 +++ 16 files changed, 32 insertions(+), 65 deletions(-) delete mode 100644 .devcontainer/base/.dockerignore create mode 100644 .devcontainer/base/Dockerfile.dockerignore rename apps/login/{.dockerignore => Dockerfile.dockerignore} (100%) delete mode 100644 apps/login/acceptance/package.json rename build/login/{.dockerignore => Dockerfile.dockerignore} (100%) rename build/zitadel/{.dockerignore => Dockerfile.dockerignore} (100%) diff --git a/.devcontainer/base/.dockerignore b/.devcontainer/base/.dockerignore deleted file mode 100644 index c46149572e..0000000000 --- a/.devcontainer/base/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!pnpm-lock.yaml -!pnpm-workspace.yaml \ No newline at end of file diff --git a/.devcontainer/base/Dockerfile b/.devcontainer/base/Dockerfile index d4984b57ef..f0a7a99266 100644 --- a/.devcontainer/base/Dockerfile +++ b/.devcontainer/base/Dockerfile @@ -5,8 +5,8 @@ ENV SHELL=/bin/bash \ LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ CI=1 \ - PNPM_HOME=/root/.local/share/pnpm \ - PATH=/root/.local/share/pnpm:$PATH + PNPM_HOME=/home/node/.local/share/pnpm \ + PATH=/home/node/.local/share/pnpm:$PATH RUN apt-get update && \ apt-get --no-install-recommends install -y \ @@ -14,5 +14,9 @@ RUN apt-get update && \ apt-get clean && \ corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9.1.2 --activate -COPY pnpm-lock.yaml pnpm-workspace.yaml ./ -RUN pnpm install --frozen-lockfile --recursive +USER node +WORKDIR /home/node/preinstall +COPY pnpm-lock.yaml ./ +RUN pnpm fetch +RUN cd /home/node && pwd && ls -la && whoami +RUN pnpm store path \ No newline at end of file diff --git a/.devcontainer/base/Dockerfile.dockerignore b/.devcontainer/base/Dockerfile.dockerignore new file mode 100644 index 0000000000..39336d9031 --- /dev/null +++ b/.devcontainer/base/Dockerfile.dockerignore @@ -0,0 +1,4 @@ +* +!pnpm-lock.yaml +!pnpm-workspace.yaml +!**/package.json \ No newline at end of file diff --git a/.devcontainer/base/devcontainer.json b/.devcontainer/base/devcontainer.json index 0a0d9d95ee..fb6d406181 100644 --- a/.devcontainer/base/devcontainer.json +++ b/.devcontainer/base/devcontainer.json @@ -21,7 +21,7 @@ 4200, 8080 ], - "onCreateCommand": "pnpm install -g sass@1.64.1", + "onCreateCommand": "pnpm install --frozen-lockfile --recursive --prefer-offline", "customizations": { "jetbrains": { "settings": { diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json index a70a921625..99d350d50c 100644 --- a/.devcontainer/login-integration-debug/devcontainer.json +++ b/.devcontainer/login-integration-debug/devcontainer.json @@ -13,13 +13,6 @@ "forwardPorts": [ 3001 ], - "onCreateCommand": "pnpm cypress install", - "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login", - "customizations": { - "jetbrains": { - "settings": { - "com.intellij:app:HttpConfigurable.use_proxy_pac": true - } - } - } -} + "onCreateCommand": "pnpm install && pnpm cypress install", + "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login" +} \ No newline at end of file diff --git a/.devcontainer/login-integration/devcontainer.json b/.devcontainer/login-integration/devcontainer.json index 17c9b8e85f..8126c26612 100644 --- a/.devcontainer/login-integration/devcontainer.json +++ b/.devcontainer/login-integration/devcontainer.json @@ -12,12 +12,6 @@ "forwardPorts": [ 3001 ], - "onCreateCommand": "pnpm cypress install && pnpm test:integration:login", - "customizations": { - "jetbrains": { - "settings": { - "com.intellij:app:HttpConfigurable.use_proxy_pac": true - } - } - } + "onCreateCommand": "pnpm install --frozen-lockfile && pnpm cypress install", + "postAttachCommand": "pnpm test:integration:login" } \ No newline at end of file diff --git a/.devcontainer/turbo-lint-unit-debug/devcontainer.json b/.devcontainer/turbo-lint-unit-debug/devcontainer.json index 8f44eb1ddf..9474fb3f28 100644 --- a/.devcontainer/turbo-lint-unit-debug/devcontainer.json +++ b/.devcontainer/turbo-lint-unit-debug/devcontainer.json @@ -13,12 +13,6 @@ "forwardPorts": [ 3001 ], - "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch lint test:unit", - "customizations": { - "jetbrains": { - "settings": { - "com.intellij:app:HttpConfigurable.use_proxy_pac": true - } - } - } + "onCreateCommand": "pnpm install --recursive", + "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch lint test:unit" } \ No newline at end of file diff --git a/.devcontainer/turbo-lint-unit/devcontainer.json b/.devcontainer/turbo-lint-unit/devcontainer.json index 907e0f3972..8b7b65c6e5 100644 --- a/.devcontainer/turbo-lint-unit/devcontainer.json +++ b/.devcontainer/turbo-lint-unit/devcontainer.json @@ -9,12 +9,6 @@ "devcontainer" ], "workspaceFolder": "/workspaces", - "postStartCommand": "pnpm turbo lint test:unit", - "customizations": { - "jetbrains": { - "settings": { - "com.intellij:app:HttpConfigurable.use_proxy_pac": true - } - } - } + "onCreateCommand": "pnpm install --frozen-lockfile --recursive", + "postAttachCommand": "pnpm turbo lint test:unit" } \ No newline at end of file diff --git a/apps/login/.dockerignore b/apps/login/Dockerfile.dockerignore similarity index 100% rename from apps/login/.dockerignore rename to apps/login/Dockerfile.dockerignore diff --git a/apps/login/acceptance/package.json b/apps/login/acceptance/package.json deleted file mode 100644 index fc4a191373..0000000000 --- a/apps/login/acceptance/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "login-test-acceptance", - "private": true, - "scripts": { - "test:acceptance": "dotenv -e ../login/.env.test.local playwright", - "test:acceptance:setup": "cd ../.. && make login_test_acceptance_setup_env && NODE_ENV=test turbo run test:acceptance:setup:dev", - "test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev" - }, - "devDependencies": { - "@faker-js/faker": "^9.7.0", - "@otplib/core": "^12.0.0", - "@otplib/plugin-crypto": "^12.0.0", - "@otplib/plugin-thirty-two": "^12.0.0", - "@playwright/test": "^1.52.0", - "dotenv-cli": "^8.0.0", - "gaxios": "^7.1.0", - "typescript": "^5.8.3" - } -} diff --git a/apps/login/package.json b/apps/login/package.json index 30a5b4112c..ab04b5a65e 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -15,7 +15,7 @@ "test:unit": "vitest --run", "lint-staged": "lint-staged", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", - "test:integration:login": "wait-on http://localhost:3001/ui/v2/login && DISPLAY='' cypress run", + "test:integration:login": "wait-on http://localhost:3001/ui/v2/login/healthy && DISPLAY='' cypress run", "test:acceptance": "dotenv -e ../login/.env.test.local playwright", "test:acceptance:setup": "cd ../.. && make login_test_acceptance_setup_env && NODE_ENV=test turbo run test:acceptance:setup:dev", "test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev" diff --git a/build/login/Dockerfile b/build/login/Dockerfile index ad9163285f..322252e72c 100644 --- a/build/login/Dockerfile +++ b/build/login/Dockerfile @@ -8,7 +8,8 @@ RUN corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9 rm -rf /var/cache/apk/* WORKDIR /app COPY pnpm-lock.yaml pnpm-workspace.yaml ./ -RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm fetch --frozen-lockfile \ +RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \ + pnpm fetch --frozen-lockfile \ --filter @zitadel/login \ --filter @zitadel/client \ --filter @zitadel/proto @@ -16,7 +17,8 @@ COPY 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 \ +RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \ + pnpm install --frozen-lockfile \ --filter @zitadel/login \ --filter @zitadel/client \ --filter @zitadel/proto diff --git a/build/login/.dockerignore b/build/login/Dockerfile.dockerignore similarity index 100% rename from build/login/.dockerignore rename to build/login/Dockerfile.dockerignore diff --git a/build/zitadel/.dockerignore b/build/zitadel/Dockerfile.dockerignore similarity index 100% rename from build/zitadel/.dockerignore rename to build/zitadel/Dockerfile.dockerignore diff --git a/package.json b/package.json index 331b3d0738..5b1acd5e17 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "devDependencies": { "@changesets/cli": "^2.29.5", "@devcontainers/cli": "^0.80.0", - "turbo": "2.5.5" + "turbo": "2.5.5", + "sass": "^1.64.1" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index babdafeee8..e2d8086321 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,6 +19,9 @@ importers: '@devcontainers/cli': specifier: ^0.80.0 version: 0.80.0 + sass: + specifier: ^1.64.1 + version: 1.89.2 turbo: specifier: 2.5.5 version: 2.5.5