From ae44c4df98da6b5539c909d4a3f172b4b5f20744 Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Tue, 7 Aug 2018 13:30:27 +0200
Subject: [PATCH] fixed ci
---
.gitlab-ci.yml | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 654c2cc..3f76014 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,66 +102,68 @@ npm_publish:
only:
- /^release\/.*/
-docker_publish_production:
+docker_publish_alpha:
stage: publish
image: ubleipzig/deployer:1.0.0
services:
- docker:dind
script: |
- version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'`
deployer publish \
- --input image.tar.gz
- --docker-config "$DOCKER_AUTH_CONFIG" \
+ --input image.tar.gz \
+ --docker-config "${DOCKER_AUTH_CONFIG}" \
--name ${image_name} \
- --tag latest \
- --tag ${version} \
- --tag $(expr ${version} ':' '\([^.]\+\)') \
- --tag $(expr ${version} ':' '[^.]\+\.\([^.]\+\)') \
- --tag $(expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\))`
+ --tag ${CI_COMMIT_REF_NAME}
dependencies:
- docker_build
tags:
- - docker
- except:
- - branches
+ - docker
only:
- - /^release\/.*/
+ - branches
+ except:
+ - master
-docker_publish_alpha:
+docker_publish_staging:
stage: publish
image: ubleipzig/deployer:1.0.0
services:
- docker:dind
script: |
deployer publish \
+ --input image.tar.gz \
--docker-config "$DOCKER_AUTH_CONFIG" \
--name ${image_name} \
- --tag ${CI_COMMIT_REF_NAME}
+ --tag staging
dependencies:
- docker_build
tags:
- - docker
+ - docker
only:
- - branches
- except:
- master
-docker_publish_staging:
+docker_publish_production:
stage: publish
image: ubleipzig/deployer:1.0.0
services:
- docker:dind
script: |
+ version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'`
deployer publish \
+ --input image.tar.gz
--docker-config "$DOCKER_AUTH_CONFIG" \
--name ${image_name} \
- --tag staging
+ --tag latest \
+ --tag ${version} \
+ --tag $(expr ${version} ':' '\([^.]\+\)') \
+ --tag $(expr ${version} ':' '[^.]\+\.\([^.]\+\)') \
+ --tag $(expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\))`
dependencies:
- docker_build
tags:
- docker
+ except:
+ - branches
only:
- - master
+ - /^release\/.*/
deploy_alpha:
stage: deploy
--
GitLab