From cb7e066504a428b4476ba641245ad5f159458e35 Mon Sep 17 00:00:00 2001 From: Administrator Date: Tue, 30 Aug 2022 21:32:40 +0300 Subject: [PATCH] nginx --- .deploy/deploy-dev.yaml | 7 ++----- .gitlab-ci.yml | 1 + nginx/nginx.conf | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 4737321..218a8ca 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -7,14 +7,11 @@ services: image: mathwave/sprint-repo:battleship-nginx networks: - battleship-net - ports: - - "1236:80" + - battleship-nginx deploy: mode: replicated restart_policy: condition: any - placement: - constraints: [node.role == manager] update_config: parallelism: 1 order: start-first @@ -55,4 +52,4 @@ services: networks: battleship-net: - driver: overlay + driver: overlay \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45adc1c..2842bef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ build: .deploy: before_script: - docker login -u mathwave -p $DOCKERHUB_PASSWORD + - docker network create -d overlay battleship-nginx deploy-dev: extends: diff --git a/nginx/nginx.conf b/nginx/nginx.conf index a509bae..7895bde 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -2,7 +2,7 @@ events {} http { server { - listen 80; + listen 1236; location /api/ { proxy_pass http://backend:8000/api/;