mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 15:07:36 +00:00
chore: reproducible pipeline with dev containers (#10305)
# Which Problems Are Solved - The previous monorepo in monorepo structure for the login app and its related packages was fragmented, complicated and buggy. - The process for building and testing the login container was inconsistent between local development and CI. - Lack of clear documentation as well as easy and reliable ways for non-frontend developers to reproduce and fix failing PR checks locally. # How the Problems Are Solved - Consolidated the login app and its related npm packages by moving the main package to `apps/login/apps/login` and merging `apps/login/packages/integration` and `apps/login/packages/acceptance` into the main `apps/login` package. - Migrated from Docker Compose-based test setups to dev container-based setups, adding support for multiple dev container configurations: - `.devcontainer/base` - `.devcontainer/turbo-lint-unit` - `.devcontainer/turbo-lint-unit-debug` - `.devcontainer/login-integration` - `.devcontainer/login-integration-debug` - Added npm scripts to run the new dev container setups, enabling exact reproduction of GitHub PR checks locally, and updated the pipeline to use these containers. - Cleaned up Dockerfiles and docker-bake.hcl files to only build the production image for the login app. - Cleaned up compose files to focus on dev environments in dev containers. - Updated `CONTRIBUTING.md` with guidance on running and debugging PR checks locally using the new dev container approach. - Introduced separate Dockerfiles for the login app to distinguish between using published client packages and building clients from local protos. - Ensured the login container is always built in the pipeline for use in integration and acceptance tests. - Updated Makefile and GitHub Actions workflows to use `--frozen-lockfile` for installing pnpm packages, ensuring reproducible installs. - Disabled GitHub release creation by the changeset action. - Refactored the `/build` directory structure for clarity and maintainability. - Added a `clean` command to `docks/package.json`. - Experimentally added `knip` to the `zitadel-client` package for improved linting of dependencies and exports. # Additional Changes - Fixed Makefile commands for consistency and reliability. - Improved the structure and clarity of the `/build` directory to support seamless integration of the login build. - Enhanced documentation and developer experience for running and debugging CI checks locally. # Additional Context - See updated `CONTRIBUTING.md` for new local development and debugging instructions. - These changes are a prerequisite for further improvements to the CI pipeline and local development workflow. - Closes #10276
This commit is contained in:
35
Makefile
35
Makefile
@@ -27,7 +27,7 @@ docker_image:
|
||||
else \
|
||||
echo "Reusing precompiled zitadel binary"; \
|
||||
fi
|
||||
DOCKER_BUILDKIT=1 docker build -f build/Dockerfile -t $(ZITADEL_IMAGE) .
|
||||
DOCKER_BUILDKIT=1 docker build -f build/zitadel/Dockerfile -t $(ZITADEL_IMAGE) .
|
||||
|
||||
.PHONY: compile_pipeline
|
||||
compile_pipeline: console_move
|
||||
@@ -97,17 +97,11 @@ console_move:
|
||||
|
||||
.PHONY: console_dependencies
|
||||
console_dependencies:
|
||||
pnpm install
|
||||
|
||||
.PHONY: console_client
|
||||
console_client:
|
||||
cd console && \
|
||||
pnpm generate
|
||||
npx pnpm install --frozen-lockfile --filter=./console
|
||||
|
||||
.PHONY: console_build
|
||||
console_build: console_dependencies console_client
|
||||
cd console && \
|
||||
pnpm build
|
||||
console_build: console_dependencies
|
||||
npx pnpm turbo build --filter=./console
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
@@ -165,7 +159,7 @@ core_integration_test: core_integration_server_start core_integration_test_packa
|
||||
|
||||
.PHONY: console_lint
|
||||
console_lint:
|
||||
pnpm turbo lint --filter=./console
|
||||
npx pnpm turbo lint --filter=./console
|
||||
|
||||
.PHONY: core_lint
|
||||
core_lint:
|
||||
@@ -177,15 +171,15 @@ core_lint:
|
||||
|
||||
.PHONY: login_pull
|
||||
login_pull: login_ensure_remote
|
||||
@echo "Pulling changes from the 'login' subtree on remote $(LOGIN_REMOTE_NAME) branch $(LOGIN_REMOTE_BRANCH)"
|
||||
@echo "Pulling changes from the 'apps/login' subtree on remote $(LOGIN_REMOTE_NAME) branch $(LOGIN_REMOTE_BRANCH)"
|
||||
git fetch $(LOGIN_REMOTE_NAME) $(LOGIN_REMOTE_BRANCH)
|
||||
git merge -s ours --allow-unrelated-histories $(LOGIN_REMOTE_NAME)/$(LOGIN_REMOTE_BRANCH) -m "Synthetic merge to align histories"
|
||||
git push
|
||||
|
||||
.PHONY: login_push
|
||||
login_push: login_ensure_remote
|
||||
@echo "Pushing changes to the 'login' subtree on remote $(LOGIN_REMOTE_NAME) branch $(LOGIN_REMOTE_BRANCH)"
|
||||
git subtree split --prefix=login -b login-sync-tmp
|
||||
@echo "Pushing changes to the 'apps/login' subtree on remote $(LOGIN_REMOTE_NAME) branch $(LOGIN_REMOTE_BRANCH)"
|
||||
git subtree split --prefix=apps/login -b login-sync-tmp
|
||||
git checkout login-sync-tmp
|
||||
git fetch $(LOGIN_REMOTE_NAME) main
|
||||
git merge -s ours --allow-unrelated-histories $(LOGIN_REMOTE_NAME)/main -m "Synthetic merge to align histories"
|
||||
@@ -200,16 +194,3 @@ login_ensure_remote:
|
||||
else \
|
||||
echo "Remote $(LOGIN_REMOTE_NAME) already exists."; \
|
||||
fi
|
||||
|
||||
export LOGIN_DIR := ./login/
|
||||
export LOGIN_BAKE_CLI_ADDITIONAL_ARGS := --set login-*.context=./login/ --file ./docker-bake.hcl
|
||||
export ZITADEL_TAG ?= $(ZITADEL_IMAGE)
|
||||
include login/Makefile
|
||||
|
||||
# Intentional override of login_test_acceptance_build
|
||||
login_test_acceptance_build: docker_image
|
||||
@echo "Building login test acceptance environment with the local zitadel image"
|
||||
$(MAKE) login_test_acceptance_build_compose login_test_acceptance_build_bake
|
||||
|
||||
login_dev: docker_image typescript_generate login_test_acceptance_build_compose login_test_acceptance_cleanup login_test_acceptance_setup_dev
|
||||
@echo "Starting login test environment with the local zitadel image"
|
||||
|
Reference in New Issue
Block a user