From 8cc23df07f7d1cf5f1546ccbd0353c4070fdf21d Mon Sep 17 00:00:00 2001
From: Daniel Weipert <code@drogueronin.de>
Date: Tue, 22 Mar 2022 22:17:54 +0100
Subject: Move build files to separate folder 'n' stuff

---
 .gitignore                             |  3 +--
 Dockerfile                             |  3 ---
 docker-compose.yml                     | 15 ++++++++-------
 docker-wordpress/Dockerfile            |  3 +++
 docker-wordpress/docker-wp.example.ini |  5 +++++
 docker-wp.example.ini                  |  5 -----
 6 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker-wordpress/Dockerfile
 create mode 100644 docker-wordpress/docker-wp.example.ini
 delete mode 100644 docker-wp.example.ini

diff --git a/.gitignore b/.gitignore
index e745936..6aaa54f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 .env
-/db
-/data
+/volumes
 docker-wp.ini
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 2a0c8e4..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM wordpress:latest
-
-COPY docker-wp.ini "$PHP_INI_DIR/conf.d/"
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/docker-wordpress/Dockerfile b/docker-wordpress/Dockerfile
new file mode 100644
index 0000000..2a0c8e4
--- /dev/null
+++ b/docker-wordpress/Dockerfile
@@ -0,0 +1,3 @@
+FROM wordpress:latest
+
+COPY docker-wp.ini "$PHP_INI_DIR/conf.d/"
diff --git a/docker-wordpress/docker-wp.example.ini b/docker-wordpress/docker-wp.example.ini
new file mode 100644
index 0000000..a236954
--- /dev/null
+++ b/docker-wordpress/docker-wp.example.ini
@@ -0,0 +1,5 @@
+upload_max_filesize = 512M
+post_max_size = 512M
+
+max_execution_time = 300
+max_input_vars = 5000
diff --git a/docker-wp.example.ini b/docker-wp.example.ini
deleted file mode 100644
index a236954..0000000
--- a/docker-wp.example.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-upload_max_filesize = 512M
-post_max_size = 512M
-
-max_execution_time = 300
-max_input_vars = 5000
-- 
cgit v1.2.3