|
|
@@ -24,7 +24,6 @@ DOCKER_COMPOSE_TEST_UNIT = \
|
|
|
|
|
|
clean:
|
|
|
-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
|
|
|
- -docker rmi gcr.io/overleaf-ops/$(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
|
|
|
@@ -129,11 +128,10 @@ build:
|
|
|
--pull \
|
|
|
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
|
|
--tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
|
|
|
- --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
|
|
|
- --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME) \
|
|
|
- --cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME) \
|
|
|
- --cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):main \
|
|
|
--tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
|
|
|
+ --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME) \
|
|
|
+ --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME) \
|
|
|
+ --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main \
|
|
|
--file Dockerfile \
|
|
|
../..
|
|
|
|