From 92c00b3bdee2037944a6372cfb5f433ec45bf45b Mon Sep 17 00:00:00 2001
From: Jonas Leder <jonas@jonasled.de>
Date: Fri, 8 Nov 2019 16:45:39 +0100
Subject: [PATCH] spliited into build and deploy
---
.gitlab-ci.yml | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 828fa7f..1cd30cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,17 @@ services:
- docker:dind
stages:
+ - build
- deploy
+step-deploy-prod:
+ stage: build
+ script:
+ - sudo docker image prune -f
+ - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker .
+ - sudo docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker
+
step-deploy-prod:
stage: deploy
only:
@@ -13,14 +22,9 @@ step-deploy-prod:
script:
- sudo apt-get install -y python-pip
- sudo pip install docker-compose
- - sudo docker image prune -f
- - replace "5000:5000" "5003:5000" -- docker-compose-test.yml
- - replace "domains=" "$domains" -- docker-compose-test.yml
- - replace "recaptcha_private=" "$recaptcha_private" -- docker-compose-test.yml
- - replace "recaptcha_public=" "$recaptcha_public" -- docker-compose-test.yml
- - sudo docker-compose -f "docker-compose-test.yml" up -d --build
- - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker .
- - sudo docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - echo 'docker push username $CI_REGISTRY_USER'
- - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker
+ - replace "5000:5000" "5003:5000" -- docker-compose.yml
+ - replace "domains=" "$domains" -- docker-compose.yml
+ - replace "recaptcha_private=" "$recaptcha_private" -- docker-compose.yml
+ - replace "recaptcha_public=" "$recaptcha_public" -- docker-compose.yml
+ - sudo docker-compose up -d
environment: master
\ No newline at end of file
--
GitLab