diff --git a/.devcontainer/base/docker-compose.yml b/.devcontainer/base/docker-compose.yml index 0775d9592d..009c4ca593 100644 --- a/.devcontainer/base/docker-compose.yml +++ b/.devcontainer/base/docker-compose.yml @@ -42,6 +42,9 @@ services: login-integration: container_name: login-integration + build: + context: ../.. + dockerfile: dockerfiles/login.Dockerfile image: "${LOGIN_TAG:-zitadel-login:local}" env_file: ../../apps/login/apps/login/.env.test network_mode: service:devcontainer diff --git a/apps/login/apps/login/scripts/entrypoint.sh b/apps/login/apps/login/scripts/entrypoint.sh index c64bd675ce..123612d1cb 100755 --- a/apps/login/apps/login/scripts/entrypoint.sh +++ b/apps/login/apps/login/scripts/entrypoint.sh @@ -8,4 +8,6 @@ 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 server.js + + +exec node /runtime/apps/login/apps/login/server.js diff --git a/apps/login/packages/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json b/apps/login/packages/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json index 50583cb3c6..ebfaaadb85 100644 --- a/apps/login/packages/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json +++ b/apps/login/packages/integration/core-mock/initial-stubs/zitadel.settings.v2.SettingsService.json @@ -58,7 +58,7 @@ }, { "service": "zitadel.settings.v2.SettingsService", - "method": "GetHostedLoginTranslations", + "method": "GetHostedLoginTranslation", "out": { "data": {} } diff --git a/package.json b/package.json index 5eb30a69c7..97a0943116 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,7 @@ "changeset": "changeset", "devcontainer": "devcontainer", "devcontainer:lint-unit": "pnpm devcontainer up --config .devcontainer/turbo-lint-unit/devcontainer.json --workspace-folder . --remove-existing-container", - "devcontainer:integration:login": "pnpm devcontainer up --config .devcontainer/login-integration/devcontainer.json --workspace-folder . --remove-existing-container", - "devcontainer:integration:login:build": "pnpm docker:build:login && devcontainer:integration:login", - "docker:build:login": "docker build --tag zitadel-login:local --file dockerfiles/login.Dockerfile ." + "devcontainer:integration:login": "pnpm devcontainer up --config .devcontainer/login-integration/devcontainer.json --workspace-folder . --remove-existing-container" }, "pnpm": { "overrides": {