From 807c599b85480526e7e7f0bf4b2500e011ee1505 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 7 Oct 2019 20:03:07 +0300 Subject: [PATCH 1/3] Typo fix --- Dockerfile.prod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.prod b/Dockerfile.prod index d683eb4..f95e799 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -3,7 +3,7 @@ ENV PYTHONUNBUFFERED 1 ENV IS_DOCKER 0 WORKDIR /app COPY requirements.txt ./ -COPY requirements-production.txt ./ +COPY requirements.production.txt ./ RUN apk add --no-cache --virtual .build-deps build-base linux-headers \ && apk add --no-cache jpeg-dev zlib-dev postgresql-dev \ From c39979e25342f8d5b97add4291acfc12b75209c4 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 7 Oct 2019 20:16:35 +0300 Subject: [PATCH 2/3] Use different python image --- Dockerfile.prod | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile.prod b/Dockerfile.prod index f95e799..0b0bccd 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,16 +1,9 @@ -FROM python:alpine +FROM python:3.5 ENV PYTHONUNBUFFERED 1 ENV IS_DOCKER 0 WORKDIR /app COPY requirements.txt ./ COPY requirements.production.txt ./ - -RUN apk add --no-cache --virtual .build-deps build-base linux-headers \ - && apk add --no-cache jpeg-dev zlib-dev postgresql-dev \ - && pip install -r requirements.txt \ - && pip install -r requirements.production.txt \ - && apk del .build-deps - COPY . ./ COPY sikweb/settings-sample-prod.py settings.py From 4181b246a1ca7946552b112803ce6c0781b54e77 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 7 Oct 2019 20:17:02 +0300 Subject: [PATCH 3/3] Add path to .ENV file on prod server --- stack-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack-compose.yml b/stack-compose.yml index 7781f95..6a6d179 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -4,3 +4,5 @@ services: image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest ports: - 8000:8000 + env_file: + - /home/sik/production/backend.env