updated docker configs

This commit is contained in:
vabene1111 2021-01-07 15:24:56 +01:00
parent c752b2e81b
commit ba9d85dfc9
4 changed files with 46 additions and 58 deletions

View File

@ -47,6 +47,10 @@ The main, and also recommended, installation option is to install this applicati
This configuration exposes the application through an nginx web server on port 80 of your machine. This configuration exposes the application through an nginx web server on port 80 of your machine.
```shell
wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/plain/docker-compose.yml
```
```yaml ```yaml
version: "3" version: "3"
services: services:
@ -65,8 +69,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
@ -77,20 +81,16 @@ services:
- 80:80 - 80:80
env_file: env_file:
- ./.env - ./.env
depends_on:
- web_recipes
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
volumes: volumes:
nginx_config: nginx_config:
staticfiles: staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'
``` ```
### Reverse Proxy ### Reverse Proxy
@ -105,6 +105,10 @@ If you use traefik, this configuration is the one for you.
Please refer to [their excellent documentation](https://doc.traefik.io/traefik/). If that does not help, Please refer to [their excellent documentation](https://doc.traefik.io/traefik/). If that does not help,
[this little example](traefik.md) might be for you. [this little example](traefik.md) might be for you.
```shell
wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/traefik-proxy/docker-compose.yml
```
```yaml ```yaml
version: "3" version: "3"
services: services:
@ -125,8 +129,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
networks: networks:
@ -140,12 +144,14 @@ services:
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
labels: # traefik example labels labels: # traefik example labels
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)" - "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)"
- "traefik.http.routers.recipes.entrypoints=web_secure" # your https endpoint - "traefik.http.routers.recipes.entrypoints=web_secure" # your https endpoint
- "traefik.http.routers.recipes.tls.certresolver=le_resolver" # your cert resolver - "traefik.http.routers.recipes.tls.certresolver=le_resolver" # your cert resolver
depends_on:
- web_recipes
networks: networks:
- default - default
- traefik - traefik
@ -156,14 +162,8 @@ networks:
external: true external: true
volumes: volumes:
nginx nginx:
staticfiles staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'
``` ```
#### nginx-proxy #### nginx-proxy
@ -180,6 +180,10 @@ LETSENCRYPT_HOST=
LETSENCRYPT_EMAIL= LETSENCRYPT_EMAIL=
``` ```
```shell
wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/nginx-proxy/docker-compose.yml
```
```yaml ```yaml
version: "3" version: "3"
services: services:
@ -200,8 +204,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
networks: networks:
@ -212,10 +216,12 @@ services:
restart: always restart: always
env_file: env_file:
- ./.env - ./.env
depends_on:
- web_recipes
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
networks: networks:
- default - default
- nginx-proxy - nginx-proxy
@ -227,14 +233,8 @@ networks:
name: nginx-proxy name: nginx-proxy
volumes: volumes:
nginx nginx:
staticfiles staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'
``` ```
## Additional Information ## Additional Information

View File

@ -17,8 +17,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
networks: networks:
@ -29,10 +29,12 @@ services:
restart: always restart: always
env_file: env_file:
- ./.env - ./.env
depends_on:
- web_recipes
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
networks: networks:
- default - default
- nginx-proxy - nginx-proxy
@ -44,11 +46,5 @@ networks:
name: nginx-proxy name: nginx-proxy
volumes: volumes:
nginx nginx:
staticfiles staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'

View File

@ -15,8 +15,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
@ -27,17 +27,13 @@ services:
- 80:80 - 80:80
env_file: env_file:
- ./.env - ./.env
depends_on:
- web_recipes
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
volumes: volumes:
nginx nginx_config:
staticfiles staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'

View File

@ -17,8 +17,8 @@ services:
- ./.env - ./.env
volumes: volumes:
- staticfiles:/opt/recipes/staticfiles - staticfiles:/opt/recipes/staticfiles
- mediafiles:/opt/recipes/mediafiles
- nginx_config:/opt/recipes/nginx/conf.d - nginx_config:/opt/recipes/nginx/conf.d
- ./mediafiles:/opt/recipes/mediafiles
depends_on: depends_on:
- db_recipes - db_recipes
networks: networks:
@ -32,12 +32,14 @@ services:
volumes: volumes:
- nginx_config:/etc/nginx/conf.d:ro - nginx_config:/etc/nginx/conf.d:ro
- staticfiles:/static - staticfiles:/static
- mediafiles:/media - ./mediafiles:/media
labels: # traefik example labels labels: # traefik example labels
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)" - "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)"
- "traefik.http.routers.recipes.entrypoints=web_secure" # your https endpoint - "traefik.http.routers.recipes.entrypoints=web_secure" # your https endpoint
- "traefik.http.routers.recipes.tls.certresolver=le_resolver" # your cert resolver - "traefik.http.routers.recipes.tls.certresolver=le_resolver" # your cert resolver
depends_on:
- web_recipes
networks: networks:
- default - default
- traefik - traefik
@ -48,11 +50,5 @@ networks:
external: true external: true
volumes: volumes:
nginx nginx:
staticfiles staticfiles:
mediafiles:
driver: local
driver_opts:
type: 'none'
o: 'bind'
device: './mediafiles'