From 2079fb48cfdb761dd41ecc1897e9e1e917ee2250 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Vanhalle <jc.vanhalle@gmail.com>
Date: Thu, 16 Jul 2020 15:32:14 +0200
Subject: [PATCH] adds reverse proxy env variable and wp-php image tag variable

---
 .env-example       | 6 ++++--
 create.sh          | 2 +-
 docker-compose.yml | 6 +++---
 purge.sh           | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.env-example b/.env-example
index 8a33f81..c60123a 100644
--- a/.env-example
+++ b/.env-example
@@ -1,8 +1,10 @@
 DB_ROOT_PASSWORD=root
 DB_USER=user
 DB_USER_PASSWORD=user
-DOCKER_PREFIX=
-MOUNT_USER=
+DOCKER_PREFIX=wp
+DOCKER_IMAGE_TAG=dev
+MOUNT_USER=username
+TRAEFIK_NETWORK_NAME=traefik
 WP_ADMIN_PASSWORD=admin
 WP_ADMIN_USERNAME=admin
 WP_DEFAULT_PROTOCOL=https
diff --git a/create.sh b/create.sh
index e8ef798..c812f25 100755
--- a/create.sh
+++ b/create.sh
@@ -69,5 +69,5 @@ docker exec --user www-data $DOCKER_PREFIX-web /bin/sh -c "
         --path=/var/www/html";
 
 echo "Connect network to traefik";
-docker network connect $DOCKER_PREFIX traefik;
+docker network connect $DOCKER_PREFIX $TRAEFIK_NETWORK_NAME;
 docker-compose up -d adminer
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d54d01..1fbba66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - traefik.enable=true
       - traefik.http.routers.${DOCKER_PREFIX}-adminer.entrypoints=https
       - traefik.http.routers.${DOCKER_PREFIX}-adminer.rule=Host(`${WP_URL}`) && PathPrefix(`/adminer/`)
-      - traefik.http.routers.${DOCKER_PREFIX}-adminer.tls=true
+      - traefik.http.routers.${DOCKER_PREFIX}-adminer.tls=true # remove if using LE as default TLS
       - traefik.http.services.${DOCKER_PREFIX}-adminer.loadbalancer.server.port=8080
   db:
     command: --default-authentication-plugin=mysql_native_password
@@ -29,12 +29,12 @@ services:
       - db:/var/lib/mysql
   web:
     container_name: ${DOCKER_PREFIX}-web
-    image: wp-php7.3:dev
+    image: wp-php7.3:${DOCKER_IMAGE_TAG}
     labels:
       - traefik.enable=true
       - traefik.http.routers.${DOCKER_PREFIX}-web.entrypoints=https
       - traefik.http.routers.${DOCKER_PREFIX}-web.rule=Host(`${WP_URL}`)
-      - traefik.http.routers.${DOCKER_PREFIX}-web.tls=true
+      - traefik.http.routers.${DOCKER_PREFIX}-web.tls=true # remove if using LE as default TLS provider
       - traefik.http.services.${DOCKER_PREFIX}-web.loadbalancer.server.port=80
     volumes:
       - web:/var/www/html
diff --git a/purge.sh b/purge.sh
index 1f4ac56..65255a0 100755
--- a/purge.sh
+++ b/purge.sh
@@ -6,7 +6,7 @@ source .env;
 set +o allexport
 
 docker-compose stop
-docker network disconnect $DOCKER_PREFIX traefik
+docker network disconnect $DOCKER_PREFIX $TRAEFIK_NETWORK_NAME
 docker network rm $DOCKER_PREFIX
 docker rm $DOCKER_PREFIX-adminer
 docker rm $DOCKER_PREFIX-web