made a lot of changes to accomodate running the same app for differnt projects.

This commit is contained in:
2020-04-24 10:43:33 -07:00
parent 206ed58eb9
commit 27e3c4e614
36 changed files with 897 additions and 121 deletions
+9 -9
View File
@@ -17,9 +17,9 @@ volumes:
bookstack-storage:
networks:
traefik_web:
admin_web:
external:
name: ${NETWORK_NAME}
name: admin_web
services:
@@ -29,11 +29,11 @@ services:
volumes:
- bookstack-db:/var/lib/mysql
networks:
- ${NETWORK_NAME}
- admin_web
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_ROOT_PASSWORD: ${BOOKSTACK_MYSQL_ROOT_PASSWORD}
MYSQL_USER: bookstack
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
MYSQL_PASSWORD: ${BOOKSTACK_MYSQL_PASSWORD}
MYSQL_DATABASE: bookstack
# https://hub.docker.com/r/solidnerd/bookstack
@@ -45,16 +45,16 @@ services:
- DB_HOST=${PREFIX}_bookstack-db_1:3306
- DB_DATABASE=bookstack
- DB_USERNAME=bookstack
- DB_PASSWORD=${MYSQL_PASSWORD}
- APP_URL=https://${DOMAIN_NAME}
- DB_PASSWORD=${BOOKSTACK_MYSQL_PASSWORD}
- APP_URL=https://${BOOKSTACK_DOMAIN_NAME}
networks:
- ${NETWORK_NAME}
- admin_web
volumes:
- bookstack-uploads:/var/www/bookstack/public/uploads
- bookstack-storage:/var/www/bookstack/storage/uploads
labels:
- "traefik.enable=true"
- "traefik.http.routers.${PREFIX}_bookstack.rule=Host(`${DOMAIN_NAME}`)"
- "traefik.http.routers.${PREFIX}_bookstack.rule=Host(`${BOOKSTACK_DOMAIN_NAME}`)"
- "traefik.http.routers.${PREFIX}_bookstack.entrypoints=websecure"
- "traefik.http.routers.${PREFIX}_bookstack.tls=true"
- "traefik.http.services.${PREFIX}_bookstack.loadbalancer.server.port=8080"
+3 -6
View File
@@ -1,14 +1,11 @@
# Domains & Project
PREFIX=p1
DOMAIN_NAME=bookstack.nickyeoman.com
BOOKSTACK_DOMAIN_NAME=bookstack.nickyeoman.com
# Passwords
MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass!
MYSQL_PASSWORD=Again2ASecurepass!
BOOKSTACK_MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass!
BOOKSTACK_MYSQL_PASSWORD=Again2ASecurepass!
# Software versions
DB_V=10.4.11
BOOKSTACK_V=0.29.0
# Network
NETWORK_NAME=traefik_web