wip changes
This commit is contained in:
parent
e3b71d47f4
commit
c67342df26
@ -1,6 +1,5 @@
|
|||||||
FROM python:3.8-alpine
|
FROM python:3.8-alpine
|
||||||
|
|
||||||
# hadolint ignore=DL3018
|
|
||||||
RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev
|
RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
@ -15,7 +14,6 @@ COPY --chown=recipes:recipes . ./
|
|||||||
RUN chmod +x boot.sh setup.sh
|
RUN chmod +x boot.sh setup.sh
|
||||||
RUN ln -s /opt/recipes/setup.sh /usr/local/bin/createsuperuser
|
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 && \
|
RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev && \
|
||||||
python -m venv venv && \
|
python -m venv venv && \
|
||||||
venv/bin/pip install -r requirements.txt --no-cache-dir &&\
|
venv/bin/pip install -r requirements.txt --no-cache-dir &&\
|
||||||
|
@ -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/).
|
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.
|
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.
|
|
19
docs/docker/nginx-proxy/docker-compose.yml
Normal file
19
docs/docker/nginx-proxy/docker-compose.yml
Normal file
@ -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
|
@ -1 +0,0 @@
|
|||||||
Just run docker-compose up in the root of this repository.
|
|
22
docs/docker/plain/docker-compose.yml
Normal file
22
docs/docker/plain/docker-compose.yml
Normal file
@ -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
|
@ -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
|
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.
|
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`.
|
You need to create a network called `traefik` using `docker network create traefik`.
|
||||||
## docker-compose.yml
|
## docker-compose.yml
|
||||||
|
40
docs/docker/traefik/docker-compose.yml
Normal file
40
docs/docker/traefik/docker-compose.yml
Normal file
@ -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
|
@ -57,8 +57,6 @@ INSTALLED_APPS = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
# Simplified static file serving.
|
|
||||||
# https://warehouse.python.org/project/whitenoise/
|
|
||||||
'whitenoise.middleware.WhiteNoiseMiddleware',
|
'whitenoise.middleware.WhiteNoiseMiddleware',
|
||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
|
Loading…
Reference in New Issue
Block a user