From 7008048415fa45b7df6dd03a487c88f62b75f56b Mon Sep 17 00:00:00 2001
From: Ulf Seltmann <seltmann@ub.uni-leipzig.de>
Date: Wed, 18 Jul 2018 09:43:10 +0200
Subject: [PATCH] adds npm-pack dependency to docker-build
---
.gitlab-ci.yml | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1208bc0..f4e9c6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,6 +78,8 @@ docker_build:
-t image \
.
docker save --output=image.tar.gz image
+ dependencies:
+ - npm_pack
artifacts:
name: docker-image
paths:
@@ -102,7 +104,7 @@ npm_publish:
only:
- /^release\/*/
-docker_publish:
+docker_publish_production:
stage: publish
image: docker:latest
services:
@@ -120,10 +122,6 @@ docker_publish:
docker tag ubleipzig/dacap:${version} ubleipzig/dacap:${tag}
docker push ubleipzig/dacap:${tag}
done
- cache:
- key: "${CI_PROJECT_ID}"
- paths:
- - .npm
tags:
- docker
except:
@@ -131,6 +129,30 @@ docker_publish:
only:
- /^release\/*/
+docker_publish_staging:
+ stage: publish
+ image: docker:latest
+ services:
+ - docker:dind
+ script: |
+ mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json
+ docker load --input=image.tar.gz
+ docker tag image ubleipzig/dacap:staging
+ docker push ubleipzig/dacap:staging
+ tags:
+ - docker
+ only:
+ - master
+
+deploy_staging:
+ stage: deploy
+ image: rancher:latest
+ environment:
+ name: staging
+ url: https://staging.ub.uni-leipzig.de/dacap
+ only:
+ - master
+
gh_pages:
stage: docs
image:
--
GitLab