diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | docker-compose.yml | 15 | ||||
| -rw-r--r-- | docker-wordpress/Dockerfile (renamed from Dockerfile) | 0 | ||||
| -rw-r--r-- | docker-wordpress/docker-wp.example.ini (renamed from docker-wp.example.ini) | 0 |
4 files changed, 9 insertions, 9 deletions
@@ -1,4 +1,3 @@ .env -/db -/data +/volumes docker-wp.ini diff --git a/docker-compose.yml b/docker-compose.yml index c237c8a..936f89f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ -version: '3' +version: '3.7' services: db: image: mysql:5.7 restart: always volumes: - - "./db:/var/lib/mysql" + - "./volumes/db:/var/lib/mysql" environment: - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" - "MYSQL_PASSWORD=${MYSQL_PASSWORD}" @@ -15,12 +15,12 @@ services: - internal app: - build: . + build: "./docker-wordpress" restart: always depends_on: - db volumes: - - "./data:/var/www/html" + - "./volumes/data:/var/www/html" environment: - "WORDPRESS_DB_HOST=db" - "WORDPRESS_DB_USER=${MYSQL_USER}" @@ -29,7 +29,7 @@ services: #- "WORDPRESS_DEBUG=1" networks: - internal - - traefik-public + - traefik labels: - "traefik.enable=true" - "traefik.docker.network=${TRAEFIK_NETWORK}" @@ -44,7 +44,7 @@ services: links: - db volumes: - - "./data:/var/www/html" + - "./volumes/data:/var/www/html" environment: - "WORDPRESS_DB_HOST=db" - "WORDPRESS_DB_USER=${MYSQL_USER}" @@ -57,5 +57,6 @@ services: networks: internal: - traefik-public: + traefik: external: true + name: "${TRAEFIK_NETWORK}" diff --git a/Dockerfile b/docker-wordpress/Dockerfile index 2a0c8e4..2a0c8e4 100644 --- a/Dockerfile +++ b/docker-wordpress/Dockerfile diff --git a/docker-wp.example.ini b/docker-wordpress/docker-wp.example.ini index a236954..a236954 100644 --- a/docker-wp.example.ini +++ b/docker-wordpress/docker-wp.example.ini |