TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Aarni Halinen
2019-10-07 20:31:48 +03:00
parent d2af34bf0c 4181b246a1
commit 48e34ece4f
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile.prod
+2 -9
View File
@@ -1,16 +1,9 @@
FROM python:alpine FROM python:3.5
ENV PYTHONUNBUFFERED 1 ENV PYTHONUNBUFFERED 1
ENV IS_DOCKER 0 ENV IS_DOCKER 0
WORKDIR /app WORKDIR /app
COPY requirements.txt ./ 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 \
&& pip install -r requirements.txt \
&& pip install -r requirements.production.txt \
&& apk del .build-deps
COPY . ./ COPY . ./
COPY sikweb/settings-sample-prod.py settings.py COPY sikweb/settings-sample-prod.py settings.py
stack-compose.yml
+2
View File
@@ -4,3 +4,5 @@ services:
image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
ports: ports:
- 8000:8000 - 8000:8000
env_file:
- /home/sik/production/backend.env