mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 17:27:31 +00:00
fix runs and contexts
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
*
|
|
||||||
!pnpm-lock.yaml
|
|
||||||
!pnpm-workspace.yaml
|
|
@@ -5,8 +5,8 @@ ENV SHELL=/bin/bash \
|
|||||||
LANG=C.UTF-8 \
|
LANG=C.UTF-8 \
|
||||||
LC_ALL=C.UTF-8 \
|
LC_ALL=C.UTF-8 \
|
||||||
CI=1 \
|
CI=1 \
|
||||||
PNPM_HOME=/root/.local/share/pnpm \
|
PNPM_HOME=/home/node/.local/share/pnpm \
|
||||||
PATH=/root/.local/share/pnpm:$PATH
|
PATH=/home/node/.local/share/pnpm:$PATH
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get --no-install-recommends install -y \
|
apt-get --no-install-recommends install -y \
|
||||||
@@ -14,5 +14,9 @@ RUN apt-get update && \
|
|||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9.1.2 --activate
|
corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9.1.2 --activate
|
||||||
|
|
||||||
COPY pnpm-lock.yaml pnpm-workspace.yaml ./
|
USER node
|
||||||
RUN pnpm install --frozen-lockfile --recursive
|
WORKDIR /home/node/preinstall
|
||||||
|
COPY pnpm-lock.yaml ./
|
||||||
|
RUN pnpm fetch
|
||||||
|
RUN cd /home/node && pwd && ls -la && whoami
|
||||||
|
RUN pnpm store path
|
4
.devcontainer/base/Dockerfile.dockerignore
Normal file
4
.devcontainer/base/Dockerfile.dockerignore
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
*
|
||||||
|
!pnpm-lock.yaml
|
||||||
|
!pnpm-workspace.yaml
|
||||||
|
!**/package.json
|
@@ -21,7 +21,7 @@
|
|||||||
4200,
|
4200,
|
||||||
8080
|
8080
|
||||||
],
|
],
|
||||||
"onCreateCommand": "pnpm install -g sass@1.64.1",
|
"onCreateCommand": "pnpm install --frozen-lockfile --recursive --prefer-offline",
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"jetbrains": {
|
"jetbrains": {
|
||||||
"settings": {
|
"settings": {
|
||||||
|
@@ -13,13 +13,6 @@
|
|||||||
"forwardPorts": [
|
"forwardPorts": [
|
||||||
3001
|
3001
|
||||||
],
|
],
|
||||||
"onCreateCommand": "pnpm cypress install",
|
"onCreateCommand": "pnpm install && pnpm cypress install",
|
||||||
"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login",
|
"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login"
|
||||||
"customizations": {
|
|
||||||
"jetbrains": {
|
|
||||||
"settings": {
|
|
||||||
"com.intellij:app:HttpConfigurable.use_proxy_pac": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -12,12 +12,6 @@
|
|||||||
"forwardPorts": [
|
"forwardPorts": [
|
||||||
3001
|
3001
|
||||||
],
|
],
|
||||||
"onCreateCommand": "pnpm cypress install && pnpm test:integration:login",
|
"onCreateCommand": "pnpm install --frozen-lockfile && pnpm cypress install",
|
||||||
"customizations": {
|
"postAttachCommand": "pnpm test:integration:login"
|
||||||
"jetbrains": {
|
|
||||||
"settings": {
|
|
||||||
"com.intellij:app:HttpConfigurable.use_proxy_pac": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -13,12 +13,6 @@
|
|||||||
"forwardPorts": [
|
"forwardPorts": [
|
||||||
3001
|
3001
|
||||||
],
|
],
|
||||||
"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch lint test:unit",
|
"onCreateCommand": "pnpm install --recursive",
|
||||||
"customizations": {
|
"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch lint test:unit"
|
||||||
"jetbrains": {
|
|
||||||
"settings": {
|
|
||||||
"com.intellij:app:HttpConfigurable.use_proxy_pac": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -9,12 +9,6 @@
|
|||||||
"devcontainer"
|
"devcontainer"
|
||||||
],
|
],
|
||||||
"workspaceFolder": "/workspaces",
|
"workspaceFolder": "/workspaces",
|
||||||
"postStartCommand": "pnpm turbo lint test:unit",
|
"onCreateCommand": "pnpm install --frozen-lockfile --recursive",
|
||||||
"customizations": {
|
"postAttachCommand": "pnpm turbo lint test:unit"
|
||||||
"jetbrains": {
|
|
||||||
"settings": {
|
|
||||||
"com.intellij:app:HttpConfigurable.use_proxy_pac": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
@@ -15,7 +15,7 @@
|
|||||||
"test:unit": "vitest --run",
|
"test:unit": "vitest --run",
|
||||||
"lint-staged": "lint-staged",
|
"lint-staged": "lint-staged",
|
||||||
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
|
"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": "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": "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"
|
"test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev"
|
||||||
|
@@ -8,7 +8,8 @@ RUN corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@9
|
|||||||
rm -rf /var/cache/apk/*
|
rm -rf /var/cache/apk/*
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY pnpm-lock.yaml pnpm-workspace.yaml ./
|
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/login \
|
||||||
--filter @zitadel/client \
|
--filter @zitadel/client \
|
||||||
--filter @zitadel/proto
|
--filter @zitadel/proto
|
||||||
@@ -16,7 +17,8 @@ COPY package.json ./
|
|||||||
COPY apps/login/package.json ./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-proto/package.json ./packages/zitadel-proto/package.json
|
||||||
COPY packages/zitadel-client/package.json ./packages/zitadel-client/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/login \
|
||||||
--filter @zitadel/client \
|
--filter @zitadel/client \
|
||||||
--filter @zitadel/proto
|
--filter @zitadel/proto
|
||||||
|
@@ -19,6 +19,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@changesets/cli": "^2.29.5",
|
"@changesets/cli": "^2.29.5",
|
||||||
"@devcontainers/cli": "^0.80.0",
|
"@devcontainers/cli": "^0.80.0",
|
||||||
"turbo": "2.5.5"
|
"turbo": "2.5.5",
|
||||||
|
"sass": "^1.64.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
3
pnpm-lock.yaml
generated
3
pnpm-lock.yaml
generated
@@ -19,6 +19,9 @@ importers:
|
|||||||
'@devcontainers/cli':
|
'@devcontainers/cli':
|
||||||
specifier: ^0.80.0
|
specifier: ^0.80.0
|
||||||
version: 0.80.0
|
version: 0.80.0
|
||||||
|
sass:
|
||||||
|
specifier: ^1.64.1
|
||||||
|
version: 1.89.2
|
||||||
turbo:
|
turbo:
|
||||||
specifier: 2.5.5
|
specifier: 2.5.5
|
||||||
version: 2.5.5
|
version: 2.5.5
|
||||||
|
Reference in New Issue
Block a user