From c67342df266dfdbbbb4b131e235b49eac6d03d8b Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Tue, 24 Mar 2020 12:57:45 +0100 Subject: [PATCH] wip changes --- Dockerfile | 2 - docs/docker/nginx-proxy/README.md | 2 - docs/docker/nginx-proxy/docker-compose.yml | 19 +++++++++ .../nginx-proxy/nginx}/conf.d/Recipes.conf | 0 docs/docker/plain/README.md | 1 - docs/docker/plain/docker-compose.yml | 22 ++++++++++ docs/docker/traefik/README.md | 1 - docs/docker/traefik/docker-compose.yml | 40 +++++++++++++++++++ recipes/settings.py | 2 - 9 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 docs/docker/nginx-proxy/docker-compose.yml rename {nginx => docs/docker/nginx-proxy/nginx}/conf.d/Recipes.conf (100%) delete mode 100644 docs/docker/plain/README.md create mode 100644 docs/docker/plain/docker-compose.yml create mode 100644 docs/docker/traefik/docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 2aa8c9666..0b182b27d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM python:3.8-alpine -# hadolint ignore=DL3018 RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev ENV PYTHONUNBUFFERED 1 EXPOSE 8080 @@ -15,7 +14,6 @@ COPY --chown=recipes:recipes . ./ RUN chmod +x boot.sh setup.sh RUN ln -s /opt/recipes/setup.sh /usr/local/bin/createsuperuser -# hadolint ignore=DL3018 RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev && \ python -m venv venv && \ venv/bin/pip install -r requirements.txt --no-cache-dir &&\ diff --git a/docs/docker/nginx-proxy/README.md b/docs/docker/nginx-proxy/README.md index 521e4bfc6..ceca1510c 100644 --- a/docs/docker/nginx-proxy/README.md +++ b/docs/docker/nginx-proxy/README.md @@ -2,5 +2,3 @@ This is a docker compose example when using [jwilder's nginx reverse proxy](http in combination with [jrcs's letsencrypt companion](https://hub.docker.com/r/jrcs/letsencrypt-nginx-proxy-companion/). Please refer to the appropriate documentation on how to setup the reverse proxy and networks. - -Copy the docker-compose.override.yml.template and uncomment the corresponding part. \ No newline at end of file diff --git a/docs/docker/nginx-proxy/docker-compose.yml b/docs/docker/nginx-proxy/docker-compose.yml new file mode 100644 index 000000000..998252657 --- /dev/null +++ b/docs/docker/nginx-proxy/docker-compose.yml @@ -0,0 +1,19 @@ +version: "3" +services: + nginx_recipes: + image: nginx:mainline-alpine + restart: always + env_file: + - ./.env + volumes: + - ./nginx/conf.d:/etc/nginx/conf.d + - ./staticfiles:/static + - ./mediafiles:/media + networks: + - default + - nginx-proxy + +networks: + nginx-proxy: + external: + name: nginx-proxy \ No newline at end of file diff --git a/nginx/conf.d/Recipes.conf b/docs/docker/nginx-proxy/nginx/conf.d/Recipes.conf similarity index 100% rename from nginx/conf.d/Recipes.conf rename to docs/docker/nginx-proxy/nginx/conf.d/Recipes.conf diff --git a/docs/docker/plain/README.md b/docs/docker/plain/README.md deleted file mode 100644 index fb7eb4302..000000000 --- a/docs/docker/plain/README.md +++ /dev/null @@ -1 +0,0 @@ -Just run docker-compose up in the root of this repository. \ No newline at end of file diff --git a/docs/docker/plain/docker-compose.yml b/docs/docker/plain/docker-compose.yml new file mode 100644 index 000000000..ea98758e9 --- /dev/null +++ b/docs/docker/plain/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3" +services: + db_recipes: + restart: always + image: postgres:11-alpine + volumes: + - ./postgresql:/var/lib/postgresql/data + env_file: + - ./.env + + web_recipes: + build: . + restart: always + env_file: + - ./.env + volumes: + - ./staticfiles:/opt/recipes/staticfiles + - ./mediafiles:/opt/recipes/mediafiles + ports: + - 80:8080 + depends_on: + - db_recipes diff --git a/docs/docker/traefik/README.md b/docs/docker/traefik/README.md index 17c0083cc..7ebb14e32 100644 --- a/docs/docker/traefik/README.md +++ b/docs/docker/traefik/README.md @@ -1,7 +1,6 @@ Please refer to the traefik documentation on how to setup a docker service in traefik. Since treafik can be a little confusing at times, the following are examples of my traefik configuration. -Copy the docker-compose.override.yml.template and uncomment the corresponding part. You need to create a network called `traefik` using `docker network create traefik`. ## docker-compose.yml diff --git a/docs/docker/traefik/docker-compose.yml b/docs/docker/traefik/docker-compose.yml new file mode 100644 index 000000000..c72b510f0 --- /dev/null +++ b/docs/docker/traefik/docker-compose.yml @@ -0,0 +1,40 @@ +version: "3" +services: + db_recipes: + restart: always + image: "postgres:11-alpine" + volumes: + - ./postgresql:/var/lib/postgresql/data + env_file: + - ./.env + + web_recipes: + build: . + restart: always + env_file: + - ./.env + command: "gunicorn --bind 0.0.0.0:8080 recipes.wsgi" + volumes: + - .:/Recipes + depends_on: + - db_recipes + + nginx_recipes: + image: "nginx" + restart: always + env_file: + - ./.env + volumes: + - ./nginx/conf.d:/etc/nginx/conf.d + - ./staticfiles:/static + - ./mediafiles:/media + labels: + - "traefik.enable=true" + - "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)" + - "traefik.http.routers.recipes.entrypoints=web_secure" + - "traefik.http.routers.recipes.tls.certresolver=le_resolver" + +networks: + default: + external: + name: traefik diff --git a/recipes/settings.py b/recipes/settings.py index ab58c511c..2a8ffac77 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -57,8 +57,6 @@ INSTALLED_APPS = [ ] MIDDLEWARE = [ - # Simplified static file serving. - # https://warehouse.python.org/project/whitenoise/ 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',