From 3a70b437e8170d69f4adad4936c6a470bd64d086 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sun, 8 Nov 2020 15:51:45 +0100
Subject: [PATCH] Change gitlab-ci according to d-zone and the different
versions
---
.gitlab-ci.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c4703e..6b1b27a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,14 +36,17 @@ build:
stage: build
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker pull $CI_REGISTRY_IMAGE:latest || true
- - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:latest .
- - docker push $CI_REGISTRY_IMAGE:latest
+ - docker pull $CI_REGISTRY_IMAGE:port || true
+ - docker build --cache-from $CI_REGISTRY_IMAGE:port --tag $CI_REGISTRY_IMAGE:port -f Dockerfile.port .
+ - docker push $CI_REGISTRY_IMAGE:port
+ - docker build --cache-from $CI_REGISTRY_IMAGE:proxy --tag $CI_REGISTRY_IMAGE:proxy -f Dockerfile.proxy .
+ - docker push $CI_REGISTRY_IMAGE:proxy
+
publish:
stage: publish
script:
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
- - docker build --tag $DOCKER_USER/$DOCKER_REPO:arm .
- - docker push $DOCKER_USER/$DOCKER_REPO:arm
- - docker system prune --all --force
-
+ - docker build --tag $DOCKER_USER/$DOCKER_REPO:arm.port -f Dockerfile.port .
+ - docker push $DOCKER_USER/$DOCKER_REPO:arm.port
+ - docker build --tag $DOCKER_USER/$DOCKER_REPO:arm.proxy -f Dockerfile.proxy .
+ - docker push $DOCKER_USER/$DOCKER_REPO:arm.proxy
\ No newline at end of file
--
GitLab