From 599c5a47db30407938c8bfa02c9ab2d6a138be04 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 21 Aug 2022 16:49:49 +0300 Subject: [PATCH] dockerfiles --- .gitlab-ci.yml | 4 +++- Dockerfile => dockerfiles/base/Dockerfile | 11 ++++------- dockerfiles/main/Dockerfile | 7 +++++++ 3 files changed, 14 insertions(+), 8 deletions(-) rename Dockerfile => dockerfiles/base/Dockerfile (75%) create mode 100644 dockerfiles/main/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6bfc33..d236d2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,9 @@ build: before_script: - docker login -u mathwave -p $DOCKERHUB_PASSWORD script: - - docker build -t mathwave/sprint-repo:sprint . + - docker build -t mathwave/sprint-repo:base dockerfiles/base + - docker push mathwave/sprint-repo:base + - docker build -t mathwave/sprint-repo:sprint dockerfiles/main - docker push mathwave/sprint-repo:sprint - docker build -t mathwave/sprint-repo:sprint-nginx nginx - docker push mathwave/sprint-repo:sprint-nginx diff --git a/Dockerfile b/dockerfiles/base/Dockerfile similarity index 75% rename from Dockerfile rename to dockerfiles/base/Dockerfile index d9f9f6e..69a094f 100644 --- a/Dockerfile +++ b/dockerfiles/base/Dockerfile @@ -9,12 +9,9 @@ RUN addgroup -S docker ENV PYTHONUNBUFFERED 1 ENV DJANGO_SETTINGS_MODULE Sprint.settings RUN mkdir -p /usr/src/app/ + +COPY ../../requirements.txt /usr/src/app/requirements.txt + WORKDIR /usr/src/app/ -COPY . /usr/src/app/ - -RUN chmod 777 /usr/src/app/run.sh - -RUN pip3 install -r requirements.txt - -CMD ["./manage.py", "checker"] +RUN pip3 install -r requirements.txt \ No newline at end of file diff --git a/dockerfiles/main/Dockerfile b/dockerfiles/main/Dockerfile new file mode 100644 index 0000000..f3dccb7 --- /dev/null +++ b/dockerfiles/main/Dockerfile @@ -0,0 +1,7 @@ +FROM mathwave/sprint-repo:base + +COPY . /usr/src/app/ + +RUN chmod 777 /usr/src/app/run.sh + +CMD ["./manage.py", "checker"] \ No newline at end of file