From 08b932d9afff931cd1a75c00693789ce786a09e3 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Sat, 27 Jan 2018 12:43:12 +0000 Subject: [PATCH] Updated configuration --- README.org | 7 ++++++- compose/django/Dockerfile | 2 +- compose/django/live-gunicorn-mhackspace.sh | 1 - compose/postgres/Dockerfile | 2 +- live.yml | 7 ------- stage.yml | 7 ------- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/README.org b/README.org index 008ce6f..cf50b6f 100644 --- a/README.org +++ b/README.org @@ -98,7 +98,12 @@ return response.status_code Example service setup for website under docker, nginx in a container forwarding traffic to uwsgi. *** nginx web server #+BEGIN_SRC bash -docker run --name=nginx -d -v /etc/nginx/sites-enabled/:/etc/nginx/sites-enabled/ -v /etc/letsencrypt/:/etc/letsencrypt/ -v /var/www/:/var/www/ -v sockets:/data/sockets -p 80:80 -p 443:443 olymk2/nginx +docker volume create --name=sockets +docker run --name=nginx -d \ + -v /etc/nginx/sites-enabled/:/etc/nginx/sites-enabled/ \ + -v /etc/letsencrypt/:/etc/letsencrypt/ \ + -v /var/www/:/var/www/ \ + -v sockets:/data/sockets -p 80:80 -p 443:443 olymk2/nginx #+END_SRC *** letsencrypt cert setup Setup / create new certs diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile index a3d19d2..2794dc1 100644 --- a/compose/django/Dockerfile +++ b/compose/django/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.5 +FROM python:3.6 ENV PYTHONUNBUFFERED 1 diff --git a/compose/django/live-gunicorn-mhackspace.sh b/compose/django/live-gunicorn-mhackspace.sh index 953d935..ae2938a 100755 --- a/compose/django/live-gunicorn-mhackspace.sh +++ b/compose/django/live-gunicorn-mhackspace.sh @@ -1,5 +1,4 @@ #!/bin/sh -#rm -R /app/staticfiles/* #python /app/manage.py collectstatic --noinput #python /app/manage.py compilescss diff --git a/compose/postgres/Dockerfile b/compose/postgres/Dockerfile index d296e0a..950790d 100644 --- a/compose/postgres/Dockerfile +++ b/compose/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:9.6 +FROM postgres:10 # add backup scripts ADD backup.sh /usr/local/bin/backup diff --git a/live.yml b/live.yml index a634b9d..df6cf1c 100644 --- a/live.yml +++ b/live.yml @@ -55,10 +55,3 @@ services: - postgres - redis command: celery -A mhackspace.celeryapp beat -l INFO - - bucket: - image: minio/minio - env_file: .env - volumes: - - ./buckets:/data - command: server /data diff --git a/stage.yml b/stage.yml index 16ac030..42636a9 100644 --- a/stage.yml +++ b/stage.yml @@ -56,10 +56,3 @@ services: - postgres - redis command: celery -A mhackspace.celeryapp beat -l INFO - - bucket: - image: minio/minio - env_file: .env - volumes: - - ./buckets:/data - command: server /data