From 517f06779330131269d76fe0aee3619aae7e5ec2 Mon Sep 17 00:00:00 2001 From: clemens Date: Thu, 7 Dec 2017 13:06:18 +0100 Subject: [PATCH 1/2] add docker files --- Dockerfile | 9 +++++++++ docker-compose.yml | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..97647ee --- /dev/null +++ b/Dockerfile @@ -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 8080 +CMD ["python3", "manage.py", "runserver", "0.0.0.0:8080"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..9fe6f3c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "2" + +services: + basta_server_web: + image: docker.wiai.de/basta/server:0.1 + build: . + ports: + - "8080:8080" +# basta_server_db: +# image: postgres:alpine + \ No newline at end of file From b2565b2dc25aa5e35648fe410f837dbab6dda918 Mon Sep 17 00:00:00 2001 From: clemens Date: Thu, 14 Dec 2017 10:50:49 +0100 Subject: [PATCH 2/2] move docker to port 80 --- Dockerfile | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97647ee..909d120 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,5 +5,5 @@ 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 8080 -CMD ["python3", "manage.py", "runserver", "0.0.0.0:8080"] \ No newline at end of file +EXPOSE 80 +CMD ["python3", "manage.py", "runserver", "0.0.0.0:80"] diff --git a/docker-compose.yml b/docker-compose.yml index 9fe6f3c..e10f7ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: docker.wiai.de/basta/server:0.1 build: . ports: - - "8080:8080" + - "8080:80" # basta_server_db: # image: postgres:alpine - \ No newline at end of file +