From 899785e1d3dd076cc85e6848de0874d9a3487097 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Fri, 5 Nov 2021 22:05:19 +0300 Subject: [PATCH] gitlab --- .gitlab-ci.yml | 5 +++++ dockerfiles/worker/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58edc5c..ab20282 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,11 @@ deploy-dev: stage: deploy-dev tags: - main + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + when: on_success + - when: manual + variables: PORT: 80 script: diff --git a/dockerfiles/worker/Dockerfile b/dockerfiles/worker/Dockerfile index ff96e78..cae789a 100644 --- a/dockerfiles/worker/Dockerfile +++ b/dockerfiles/worker/Dockerfile @@ -1,3 +1,3 @@ FROM docker:dind - -WORKDIR /usr/src/app/ \ No newline at end of file +WORKDIR /usr/src/app/ +COPY . /usr/src/app \ No newline at end of file