mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Merge branch 'gitlab-ci-fix' into 'develop'
Gitlab ci fix See merge request !14
This commit is contained in:
commit
4edaa958e3
1 changed files with 7 additions and 3 deletions
|
@ -1,5 +1,7 @@
|
|||
variables:
|
||||
GIT_SUBMODULE_STRATEGY: normal
|
||||
DOCKER_COMPOSE_VERSION: 1.14.0
|
||||
PY_DOCKER_VERSION: 2.4.2
|
||||
CI: "true"
|
||||
|
||||
cache:
|
||||
|
@ -43,6 +45,8 @@ test_job:
|
|||
|
||||
deploy_review:
|
||||
stage: deploy
|
||||
only:
|
||||
- develop
|
||||
environment: review
|
||||
variables:
|
||||
COMPOSE_TLS_VERSION: "TLSv1_2"
|
||||
|
@ -51,7 +55,9 @@ deploy_review:
|
|||
DOCKER_CERT_PATH: "certs"
|
||||
before_script:
|
||||
- apk add --no-cache py-pip
|
||||
- pip install docker-compose
|
||||
- pip install --upgrade pip
|
||||
- pip install docker-compose==$DOCKER_COMPOSE_VERSION
|
||||
- pip install -U docker==$PY_DOCKER_VERSION
|
||||
- mkdir -p $DOCKER_CERT_PATH
|
||||
- echo "$DEPLOYMENT_CACERT" > $DOCKER_CERT_PATH/ca.pem
|
||||
- echo "$DEPLOYMENT_CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem
|
||||
|
@ -64,7 +70,5 @@ deploy_review:
|
|||
image: docker:17
|
||||
dependencies:
|
||||
- build_job
|
||||
only:
|
||||
- develop
|
||||
tags:
|
||||
- docker
|
||||
|
|
Loading…
Add table
Reference in a new issue