mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 15:17:33 +00:00
swappable integration login
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
FROM mcr.microsoft.com/devcontainers/base:ubuntu
|
FROM mcr.microsoft.com/devcontainers/base:ubuntu AS dev
|
||||||
|
|
||||||
RUN apt-get update
|
RUN apt-get update
|
||||||
|
|
||||||
@@ -6,4 +6,6 @@ RUN apt-get --no-install-recommends install -y \
|
|||||||
libgtk2.0-0t64 libgtk-3-0t64 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb && \
|
libgtk2.0-0t64 libgtk-3-0t64 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb && \
|
||||||
# clean up
|
# clean up
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/* && \
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
|
RUN pnpm install --recursive --frozen-lockfile .
|
@@ -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",
|
"dockerComposeFile": "docker-compose.yml",
|
||||||
"service": "devcontainer",
|
"service": "devcontainer",
|
||||||
"workspaceFolder": "/workspaces",
|
"workspaceFolder": "/workspaces",
|
||||||
@@ -12,7 +13,6 @@
|
|||||||
},
|
},
|
||||||
"ghcr.io/guiyomh/features/golangci-lint:0": {},
|
"ghcr.io/guiyomh/features/golangci-lint:0": {},
|
||||||
"ghcr.io/jungaretti/features/make:1": {},
|
"ghcr.io/jungaretti/features/make:1": {},
|
||||||
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
|
|
||||||
},
|
},
|
||||||
"forwardPorts": [
|
"forwardPorts": [
|
||||||
3000,
|
3000,
|
||||||
|
@@ -12,8 +12,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
ZITADEL_DATABASE_POSTGRES_HOST: db
|
ZITADEL_DATABASE_POSTGRES_HOST: db
|
||||||
ZITADEL_EXTERNALSECURE: false
|
ZITADEL_EXTERNALSECURE: false
|
||||||
ports:
|
|
||||||
- 3001:3001
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
container_name: db
|
container_name: db
|
||||||
@@ -44,6 +42,8 @@ services:
|
|||||||
login-integration:
|
login-integration:
|
||||||
container_name: login-integration
|
container_name: login-integration
|
||||||
image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:v4.0.0-rc.2}"
|
image: "${LOGIN_TAG:-ghcr.io/zitadel/zitadel-login:v4.0.0-rc.2}"
|
||||||
|
env_file:
|
||||||
|
- fileName: ../apps/login/apps/login/.env.test
|
||||||
volumes:
|
volumes:
|
||||||
- ../apps/login/apps/login/.env.test:/env-files/.env:cached
|
- ../apps/login/apps/login/.env.test:/env-files/.env:cached
|
||||||
network_mode: service:devcontainer
|
network_mode: service:devcontainer
|
||||||
|
23
.devcontainer/integration-login/devcontainer.json
Normal file
23
.devcontainer/integration-login/devcontainer.json
Normal 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
14
.devcontainer/integration-login/docker-compose.yml
Normal file
14
.devcontainer/integration-login/docker-compose.yml
Normal 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
|
@@ -55,5 +55,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"service": "zitadel.settings.v2.SettingsService",
|
||||||
|
"method": "GetHostedLoginTranslations",
|
||||||
|
"out": {
|
||||||
|
"data": {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@@ -1,10 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "login-test-integration",
|
"name": "login-test-integration",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test:integration": "DISPLAY='' dotenv -e ../../apps/login/.env.test cypress",
|
"test:integration": "DISPLAY='' dotenv -e ../../apps/login/.env.test cypress"
|
||||||
"test:integration:setup": "cd .. && make login_test_integration_dev"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^22.14.1",
|
"@types/node": "^22.14.1",
|
||||||
|
Reference in New Issue
Block a user