diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml index fdd5180..3d60f6d 100644 --- a/.gitlab/ci/build.gitlab-ci.yml +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -6,4 +6,8 @@ build: artifacts: name: multi_user paths: - - multi_user \ No newline at end of file + - multi_user + only: + refs: + - master + - develop \ No newline at end of file diff --git a/.gitlab/ci/deploy.gitlab-ci.yml b/.gitlab/ci/deploy.gitlab-ci.yml index 06244ba..2446699 100644 --- a/.gitlab/ci/deploy.gitlab-ci.yml +++ b/.gitlab/ci/deploy.gitlab-ci.yml @@ -15,4 +15,9 @@ deploy: - docker build --build-arg replication_version=${RP_VERSION} --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server - 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} \ No newline at end of file + - docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} + + only: + refs: + - master + - develop \ No newline at end of file diff --git a/scripts/docker_server/Dockerfile b/scripts/docker_server/Dockerfile index 9973833..1c7782c 100644 --- a/scripts/docker_server/Dockerfile +++ b/scripts/docker_server/Dockerfile @@ -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