From 94fa090f2da8a1d008695054b82957d4ad917297 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 18 Aug 2022 13:02:40 +0300 Subject: [PATCH] gitlab --- .deploy/deploy-dev.yaml | 2 +- .deploy/deploy-prod.yaml | 2 +- .gitlab-ci.yml | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index d82004c..18ef7fa 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -1,7 +1,7 @@ version: "3.6" services: nginx: - image: sprint-infra-nginx + image: mathwave/sprint-repo:sprint-infra-nginx-dev ports: - "80:80" deploy: diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index e5981e9..1bc698e 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -2,7 +2,7 @@ version: "3.6" services: nginx: - image: sprint-infra-nginx + image: mathwave/sprint-repo:sprint-infra-nginx-prod ports: - "80:80" deploy: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9457b98..113c139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,10 @@ stages: - deploy-dev - deploy-prod +.deploy: + before_script: + - docker login -u mathwave -p $DOCKERHUB_PASSWORD + deploy-dev: stage: deploy-dev tags: @@ -11,7 +15,8 @@ deploy-dev: when: on_success - when: manual script: - - docker build -t sprint-infra-nginx nginx/nginx-dev + - docker build -t mathwave/sprint-repo:sprint-infra-nginx-dev nginx/nginx-dev + - docker push mathwave/sprint-repo:sprint-infra-nginx-dev - docker stack deploy -c ./.deploy/deploy-dev.yaml infra deploy-prod: @@ -22,5 +27,6 @@ deploy-prod: - master when: manual script: - - docker build -t sprint-infra-nginx nginx/nginx-prod + - docker build -t mathwave/sprint-repo:sprint-infra-nginx-prod nginx/nginx-prod + - docker push mathwave/sprint-repo:sprint-infra-nginx-prod - docker stack deploy -c ./.deploy/deploy-prod.yaml infra \ No newline at end of file