Merge branch 'master' of mg-server.ddns.net:BaStA/basta-server

This commit is contained in:
michigg 2017-12-14 15:19:48 +01:00
commit af512fd33a
2 changed files with 20 additions and 0 deletions

9
Dockerfile Normal file
View File

@ -0,0 +1,9 @@
FROM alpine:3.6
RUN apk upgrade --update
RUN apk add --update python3
RUN apk add --update py3-pillow
RUN pip3 install django==1.11.7 django-jinja django-rest-framework django-analytical
ADD ["ofu_app", "/app"]
WORKDIR /app
EXPOSE 80
CMD ["python3", "manage.py", "runserver", "0.0.0.0:80"]

11
docker-compose.yml Normal file
View File

@ -0,0 +1,11 @@
version: "2"
services:
basta_server_web:
image: docker.wiai.de/basta/server:0.1
build: .
ports:
- "8080:80"
# basta_server_db:
# image: postgres:alpine