diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 1408961..0a6d727 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -4,9 +4,8 @@ version: "3.4" services: nginx: - image: nginx + image: mathwave/sprint-repo:sprint-nginx volumes: - - ../nginx:/etc/nginx - /sprint-data/static:/var/www/html/static networks: - net diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index ad42631..a561c15 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -4,9 +4,8 @@ version: "3.4" services: nginx: - image: nginx + image: mathwave/sprint-repo:sprint-nginx volumes: - - ../nginx:/etc/nginx - /sprint-data/static:/var/www/html/static networks: - net diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec993c5..b812e83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ build: script: - docker build -t mathwave/sprint-repo:sprint . - docker push mathwave/sprint-repo:sprint + - docker build -t mathwave/sprint-repo:sprint-nginx nginx + - docker push mathwave/sprint-repo:sprint-nginx .deploy: before_script: diff --git a/nginx/Dockerfile b/nginx/Dockerfile new file mode 100644 index 0000000..0d947da --- /dev/null +++ b/nginx/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx +COPY nginx.conf /etc/nginx/nginx.conf \ No newline at end of file