Merge branch 'fix_deploy' into 'develop'
Fix deploy See merge request slumber/multi-user!61
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
stages:
|
||||
- test
|
||||
- build
|
||||
- deploy
|
||||
|
||||
|
||||
include:
|
||||
- local: .gitlab/ci/test.gitlab-ci.yml
|
||||
- local: .gitlab/ci/build.gitlab-ci.yml
|
||||
- local: .gitlab/ci/deploy.gitlab-ci.yml
|
||||
|
||||
@@ -10,4 +10,4 @@ build:
|
||||
only:
|
||||
refs:
|
||||
- master
|
||||
- develop
|
||||
- develop
|
||||
@@ -16,6 +16,7 @@ deploy:
|
||||
- echo "Pushing to gitlab registry ${VERSION}"
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}
|
||||
|
||||
only:
|
||||
refs:
|
||||
- master
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Download base image debian jessie
|
||||
FROM python:slim
|
||||
|
||||
ARG replication_version=0.0.21a21
|
||||
ARG replication_version=0.0.21
|
||||
ARG version=0.1.1
|
||||
|
||||
# Infos
|
||||
|
||||
Reference in New Issue
Block a user