Skip to content
Snippets Groups Projects
Verified Commit 134962f0 authored by Martin Weise's avatar Martin Weise
Browse files
parent d517183b
No related branches found
No related tags found
No related merge requests found
...@@ -523,7 +523,8 @@ release-images-amd64: ...@@ -523,7 +523,8 @@ release-images-amd64:
stage: release stage: release
image: docker:${DOCKER_VERSION}-dind image: docker:${DOCKER_VERSION}-dind
variables: variables:
PLATFORM: linux/amd64 DOCKER_BUILD_EXTRA_ARGS: --quiet --network=host --builder=docker-builder
DOCKER_COMPOSE_BUILD_EXTRA_ARGS: --builder=docker-builder
dependencies: dependencies:
- clean-images - clean-images
- test-analyse-service - test-analyse-service
...@@ -543,6 +544,7 @@ release-images-amd64: ...@@ -543,6 +544,7 @@ release-images-amd64:
- "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}" - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
- "docker logout ${CI_REGISTRY2_URL}" - "docker logout ${CI_REGISTRY2_URL}"
- "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}" - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
- docker buildx create --platform=linux/amd64 --name docker-builder --driver docker-container --use
script: script:
- REPOSITORY_URL=$CI_REGISTRY_URL make release-images - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
- REPOSITORY_URL=$CI_REGISTRY2_URL make release-images - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
...@@ -551,8 +553,8 @@ release-images-arm64: ...@@ -551,8 +553,8 @@ release-images-arm64:
stage: release stage: release
image: docker:${DOCKER_VERSION}-dind image: docker:${DOCKER_VERSION}-dind
variables: variables:
PLATFORM: linux/arm64 DOCKER_BUILD_EXTRA_ARGS: --quiet --network=host --builder=docker-builder
DOCKER_BUILD_EXTRA_ARGS: --quiet --network=host DOCKER_COMPOSE_BUILD_EXTRA_ARGS: --builder=docker-builder
dependencies: dependencies:
- clean-images - clean-images
- test-analyse-service - test-analyse-service
...@@ -572,6 +574,7 @@ release-images-arm64: ...@@ -572,6 +574,7 @@ release-images-arm64:
- "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}" - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
- "docker logout ${CI_REGISTRY2_URL}" - "docker logout ${CI_REGISTRY2_URL}"
- "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}" - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
- docker buildx create --platform=linux/arm64 --name docker-builder --driver docker-container --use
script: script:
- REPOSITORY_URL=$CI_REGISTRY_URL make release-images - REPOSITORY_URL=$CI_REGISTRY_URL make release-images
- REPOSITORY_URL=$CI_REGISTRY2_URL make release-images - REPOSITORY_URL=$CI_REGISTRY2_URL make release-images
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
.PHONY: build-images .PHONY: build-images
build-images: ## Build Docker images. build-images: ## Build Docker images.
docker build $(DOCKER_BUILD_EXTRA_ARGS) --platform=$(PLATFORM) -t dbrepo-core:build --target build ./lib/java/dbrepo-core docker build $(DOCKER_BUILD_EXTRA_ARGS) -t dbrepo-core:build --target build ./lib/java/dbrepo-core
docker build $(DOCKER_BUILD_EXTRA_ARGS) --platform=$(PLATFORM) -t dbrepo-data-service:build --target build dbrepo-data-service docker build $(DOCKER_BUILD_EXTRA_ARGS) -t dbrepo-data-service:build --target build dbrepo-data-service
docker build $(DOCKER_BUILD_EXTRA_ARGS) --platform=$(PLATFORM) -t dbrepo-metadata-service:build --target build dbrepo-metadata-service docker build $(DOCKER_BUILD_EXTRA_ARGS) -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
docker compose build $(DOCKER_BUILD_EXTRA_ARGS) --platform=$(PLATFORM) docker compose build $(DOCKER_COMPOSE_BUILD_EXTRA_ARGS)
.PHONY: build-data-service .PHONY: build-data-service
build-data-service: ## Build the Data Service. build-data-service: ## Build the Data Service.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment