diff --git a/server-ce/Makefile b/server-ce/Makefile index a095530f88..77cd451c7c 100644 --- a/server-ce/Makefile +++ b/server-ce/Makefile @@ -13,6 +13,9 @@ export OVERLEAF_TAG ?= sharelatex/sharelatex:$(BRANCH_NAME)-$(MONOREPO_REVISION) all: build-base build-community +clean: + -docker rmi $(OVERLEAF_BASE_TAG) $(OVERLEAF_TAG) + build-base: cp .dockerignore $(MONOREPO_ROOT) docker build \ diff --git a/server-ce/test/Jenkinsfile b/server-ce/test/Jenkinsfile index 6c7829c7fb..78ba08b10d 100644 --- a/server-ce/test/Jenkinsfile +++ b/server-ce/test/Jenkinsfile @@ -223,6 +223,10 @@ pipeline { dir('server-ce/test') { sh 'make clean' } + dir('server-ce') { + sh 'make clean' + } + sh 'make clean_jenkins' } } } diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile index efaa584b20..6b77986185 100644 --- a/server-ce/test/Makefile +++ b/server-ce/test/Makefile @@ -44,10 +44,10 @@ SHARD_PROJECT_NAMES = \ CLEAN_SHARDS=$(addprefix clean/,$(SHARD_PROJECT_NAMES)) clean: $(CLEAN_SHARDS) -docker compose run --no-deps --rm --entrypoint rm host-admin -rf docker-compose.override.yml docker-compose.*_*.yml data/ - -docker compose down --volumes --timeout 0 + -docker compose down --remove-orphans --rmi local --timeout 0 --volumes $(CLEAN_SHARDS): clean/%: - -COMPOSE_PROJECT_NAME=$* docker compose down --timeout=0 --volumes + -COMPOSE_PROJECT_NAME=$* docker compose down --remove-orphans --rmi local --timeout 0 --volumes prefetch: prefetch_default prefetch_default: prefetch_default_compose diff --git a/services/chat/Makefile b/services/chat/Makefile index 792f5d2cd6..add7aa79ed 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/clsi/Makefile b/services/clsi/Makefile index e02697f4e9..27a80c8cf4 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -25,8 +25,9 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes + -git clean -dfX cache compiles output HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/contacts/Makefile b/services/contacts/Makefile index 3309e298e8..ffd0010cdd 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 2b3596b0b4..77b6fb9d47 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 46dfced5c9..f79da4aedb 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 69d7f85bf4..30f85601f4 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -25,8 +25,9 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes + -git clean -dfX uploads user_files template_files HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index 7e62ba1812..ac6061a22c 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/notifications/Makefile b/services/notifications/Makefile index f8440d97e2..cc41fc7014 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/project-history/Makefile b/services/project-history/Makefile index a1d116253d..4e3b3479db 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 7d2bcacb77..5cc695b58e 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -25,8 +25,8 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) - -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local - -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local + -$(DOCKER_COMPOSE_TEST_UNIT) down --remove-orphans --rmi local --timeout 0 --volumes + -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --remove-orphans --rmi local --timeout 0 --volumes HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile index f66bda1117..a921f3b19c 100644 --- a/services/web/Jenkinsfile +++ b/services/web/Jenkinsfile @@ -479,6 +479,7 @@ pipeline { dir('services/web') { sh 'make clean' } + sh 'make clean_jenkins' } } } diff --git a/services/web/Makefile b/services/web/Makefile index f5a7542691..813b1bb74c 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -30,24 +30,32 @@ $(MODULE_MAKEFILES): Makefile.module # Clean # -clean: - -$(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=unit_test_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=unit_test_all_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=unit_test_parallel_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=unit_test_parallel_make_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_test_saas_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_test_server_ce_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_test_server_pro_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_saas_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_saas_1_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_saas_2_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_saas_3_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_saas_4_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_server_ce_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=acceptance_modules_merged_server_pro_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=test_frontend_ct_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local - -COMPOSE_PROJECT_NAME=tar_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) down --rmi local +SHARD_PROJECT_NAMES = \ + unit_test_$(BUILD_DIR_NAME) \ + unit_test_all_$(BUILD_DIR_NAME) \ + unit_test_parallel_$(BUILD_DIR_NAME) \ + unit_test_parallel_make_$(BUILD_DIR_NAME) \ + acceptance_test_saas_$(BUILD_DIR_NAME) \ + acceptance_test_server_ce_$(BUILD_DIR_NAME) \ + acceptance_test_server_pro_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_saas_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_saas_1_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_saas_2_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_saas_3_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_saas_4_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_server_ce_$(BUILD_DIR_NAME) \ + acceptance_modules_merged_server_pro_$(BUILD_DIR_NAME) \ + test_frontend_ct_$(BUILD_DIR_NAME) \ + tar_$(BUILD_DIR_NAME) \ + +CLEAN_SHARDS=$(addprefix clean/,$(SHARD_PROJECT_NAMES)) +clean: $(CLEAN_SHARDS) + -docker rmi --force $(IMAGE_CI) $(IMAGE_CI)-dev $(IMAGE_CI)-pug $(IMAGE_CI)-webpack $(IMAGE_REPO_FINAL) + -docker compose down --remove-orphans --rmi local --timeout 0 --volumes + -git clean -dfX data/ + +$(CLEAN_SHARDS): clean/%: + -COMPOSE_PROJECT_NAME=$* docker compose down --remove-orphans --rmi local --timeout 0 --volumes clean_ci: $(DOCKER_COMPOSE) down -v -t 0