swappable integration login

This commit is contained in:
Elio Bischof
2025-07-22 01:23:40 +02:00
parent e992610c3b
commit 9c2f9707b8
7 changed files with 54 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/base:ubuntu
FROM mcr.microsoft.com/devcontainers/base:ubuntu AS dev
RUN apt-get update
@@ -7,3 +7,5 @@ RUN apt-get --no-install-recommends install -y \
# clean up
rm -rf /var/lib/apt/lists/* && \
apt-get clean
RUN pnpm install --recursive --frozen-lockfile .

View File

@@ -1,5 +1,6 @@
{
"name": "zitadel",
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/refs/heads/main/schemas/devContainer.schema.json",
"name": "devcontainer",
"dockerComposeFile": "docker-compose.yml",
"service": "devcontainer",
"workspaceFolder": "/workspaces",
@@ -12,7 +13,6 @@
},
"ghcr.io/guiyomh/features/golangci-lint:0": {},
"ghcr.io/jungaretti/features/make:1": {},
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
},
"forwardPorts": [
3000,

View File

@@ -12,8 +12,6 @@ services:
environment:
ZITADEL_DATABASE_POSTGRES_HOST: db
ZITADEL_EXTERNALSECURE: false
ports:
- 3001:3001
db:
container_name: db
@@ -44,6 +42,8 @@ services:
login-integration:
container_name: login-integration
image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:v4.0.0-rc.2}"
env_file:
- fileName: ../apps/login/apps/login/.env.test
volumes:
- ../apps/login/apps/login/.env.test:/env-files/.env:cached
network_mode: service:devcontainer

View File

@@ -0,0 +1,23 @@
{
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/refs/heads/main/schemas/devContainer.schema.json",
"name": "login",
"dockerComposeFile": [
"../docker-compose.yml",
"docker-compose.yml"
],
"service": "devcontainer",
"workspaceFolder": "/workspaces",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "lts/iron"
}
},
"forwardPorts": [3001],
"customizations": {
"jetbrains": {
"settings": {
"com.intellij:app:HttpConfigurable.use_proxy_pac": true
}
}
}
}

View File

@@ -0,0 +1,14 @@
services:
login-integration:
extends:
file: ../docker-compose.yml
service: devcontainer
container_name: login-integration
command: pnpm turbo @zitadel/login#dev
network_mode: service:devcontainer
environment:
NODE_ENV: 'test'
PORT: 3001
depends_on:
mock-zitadel:
condition: service_started

View File

@@ -55,5 +55,12 @@
}
}
}
},
{
"service": "zitadel.settings.v2.SettingsService",
"method": "GetHostedLoginTranslations",
"out": {
"data": {}
}
}
]

View File

@@ -1,10 +1,8 @@
{
"name": "login-test-integration",
"private": true,
"type": "module",
"scripts": {
"test:integration": "DISPLAY='' dotenv -e ../../apps/login/.env.test cypress",
"test:integration:setup": "cd .. && make login_test_integration_dev"
"test:integration": "DISPLAY='' dotenv -e ../../apps/login/.env.test cypress"
},
"devDependencies": {
"@types/node": "^22.14.1",