Merge pull request 'testing' (#3) from testing into main

Reviewed-on: #3
This commit is contained in:
rama 2023-11-26 12:17:31 +01:00
commit 64dae9b7c1
2 changed files with 7 additions and 10 deletions

4
.gitignore vendored
View File

@ -1,7 +1,5 @@
.env .env
data/plugins/* data
data/themes/*
data/uploads/*
nginx-conf/nginx.conf nginx-conf/nginx.conf

View File

@ -2,14 +2,14 @@ version: '1'
networks: networks:
default: default:
name: "${TRAEFIK_NETWORK}"
external: true
db:
name: "${PROJECT_NAME}_wordpress_db_net" name: "${PROJECT_NAME}_wordpress_db_net"
external: false external: false
be: be:
name: "${PROJECT_NAME}_wordpress_net" name: "${PROJECT_NAME}_wordpress_net"
external: false external: false
traefik:
name: "${TRAEFIK_NETWORK}"
external: true
services: services:
webserver: webserver:
@ -27,6 +27,7 @@ services:
- "./nginx-conf:/etc/nginx/conf.d" - "./nginx-conf:/etc/nginx/conf.d"
- "./php-conf:/usr/local/etc/php" - "./php-conf:/usr/local/etc/php"
networks: networks:
- "traefik"
- "be" - "be"
labels: labels:
# Watchtower add to auto update # Watchtower add to auto update
@ -58,7 +59,7 @@ services:
- "WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD}" - "WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD}"
- "WORDPRESS_DB_NAME=${MYSQL_DATABASE}" - "WORDPRESS_DB_NAME=${MYSQL_DATABASE}"
networks: networks:
- "db" - "default"
- "be" - "be"
labels: labels:
# Watchtower add to auto update # Watchtower add to auto update
@ -74,8 +75,6 @@ services:
env_file: ".env" env_file: ".env"
volumes: volumes:
- "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db:/var/lib/mysql" - "${PROJECT_DATA}/${PROJECT_NAME}-wordpress/db:/var/lib/mysql"
networks:
- "db"
labels: labels:
# Watchtower add to auto update # Watchtower add to auto update
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"