From 664920ac22b614ec3fb607218b3c7cc5f889200b Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Tue, 27 Nov 2018 23:16:43 +0100
Subject: [PATCH] restruct docker tags
---
.gitlab-ci.yml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26184fe096..4715e00591 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -156,12 +156,12 @@ test:arch:
variables:
DOCKER_DRIVER: overlay2
DOCKER_HOST: docker
- IMAGE_TAG_NIGHTLY_ALL: $CI_REGISTRY_IMAGE/nightly:latest
- IMAGE_TAG_NIGHTLY_CLI: $CI_REGISTRY_IMAGE/nightly-cli:latest
- IMAGE_TAG_RELEASE_ALL: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
- IMAGE_TAG_RELEASE_LATEST_ALL: $CI_REGISTRY_IMAGE:latest
- IMAGE_TAG_RELEASE_CLI: $CI_REGISTRY_IMAGE/cli:$CI_COMMIT_REF_NAME
- IMAGE_TAG_RELEASE_LATEST_CLI: $CI_REGISTRY_IMAGE/cli:latest
+ IMAGE_TAG_GUI_NIGHTLY: $CI_REGISTRY_IMAGE/gui:nightly
+ IMAGE_TAG_GUI_RELEASE: $CI_REGISTRY_IMAGE/gui:$CI_COMMIT_REF_NAME
+ IMAGE_TAG_GUI_LATEST: $CI_REGISTRY_IMAGE/gui:latest
+ IMAGE_TAG_CLI_NIGHTLY: $CI_REGISTRY_IMAGE/cli:nightly
+ IMAGE_TAG_CLI_RELEASE: $CI_REGISTRY_IMAGE/cli:$CI_COMMIT_REF_NAME
+ IMAGE_TAG_CLI_LATEST: $CI_REGISTRY_IMAGE/cli:latest
services:
- docker:dind
before_script:
@@ -178,12 +178,12 @@ docker:build-nightly:
variables:
- $SCHEDULED_NIGHTLY
script:
- - docker build -f extra/docker/master/Dockerfile -t "$IMAGE_TAG_NIGHTLY_ALL" .
- - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_NIGHTLY_CLI" .
- - docker run "$IMAGE_TAG_NIGHTLY_ALL" /usr/bin/aql2 --help
- - docker run "$IMAGE_TAG_NIGHTLY_CLI" /usr/bin/aql2 --help
- - docker push "$IMAGE_TAG_NIGHTLY_ALL"
- - docker push "$IMAGE_TAG_NIGHTLY_CLI"
+ - docker build -f extra/docker/master/Dockerfile -t "$IMAGE_TAG_GUI_NIGHTLY" .
+ - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_CLI_NIGHTLY" .
+ - docker run "$IMAGE_TAG_GUI_NIGHTLY" /usr/bin/aql2 --help
+ - docker run "$IMAGE_TAG_CLI_NIGHTLY" /usr/bin/aql2 --help
+ - docker push "$IMAGE_TAG_GUI_NIGHTLY"
+ - docker push "$IMAGE_TAG_CLI_NIGHTLY"
docker:build-release:
<<: *docker_template
@@ -192,11 +192,11 @@ docker:build-release:
except:
- branches
script:
- - docker build -f extra/docker/master/Dockerfile -t "$IMAGE_TAG_RELEASE_ALL" -t "$IMAGE_TAG_LATEST_ALL" .
- - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_RELEASE_CLI" -t "$IMAGE_TAG_LATEST_CLI" .
- - docker run "$IMAGE_TAG_RELEASE_ALL" /usr/bin/aql2 --help
- - docker run "$IMAGE_TAG_RELEASE_CLI" /usr/bin/aql2 --help
- - docker push "$IMAGE_TAG_RELEASE_ALL"
- - docker push "$IMAGE_TAG_RELEASE_CLI"
- - docker push "$IMAGE_TAG_RELEASE_LATEST_ALL"
- - docker push "$IMAGE_TAG_RELEASE_LATEST_CLI"
+ - docker build -f extra/docker/master/Dockerfile -t "$IMAGE_TAG_GUI_RELEASE" -t "$IMAGE_TAG_GUI_LATEST" .
+ - docker build -f extra/docker/master-cli/Dockerfile -t "$IMAGE_TAG_CLI_RELEASE" -t "$IMAGE_TAG_CLI_LATEST" .
+ - docker run "$IMAGE_TAG_GUI_RELEASE" /usr/bin/aql2 --help
+ - docker run "$IMAGE_TAG_CLI_RELEASE" /usr/bin/aql2 --help
+ - docker push "$IMAGE_TAG_GUI_RELEASE"
+ - docker push "$IMAGE_TAG_CLI_RELEASE"
+ - docker push "$IMAGE_TAG_GUI_LATEST"
+ - docker push "$IMAGE_TAG_CLI_LATEST"
--
GitLab