From 93396bdba7bf39dbc5bbe4237c2fca9e645ee314 Mon Sep 17 00:00:00 2001
From: Daniel Yu <danielmethod@gmail.com>
Date: Wed, 26 Jul 2017 22:46:02 +0800
Subject: [PATCH] replace env infos with variables, add lb and healthcheck

---
 templates/wordpress/1/docker-compose.yml  | 31 +++++-----
 templates/wordpress/1/rancher-compose.yml | 70 ++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/templates/wordpress/1/docker-compose.yml b/templates/wordpress/1/docker-compose.yml
index c99aba0..9021b8d 100644
--- a/templates/wordpress/1/docker-compose.yml
+++ b/templates/wordpress/1/docker-compose.yml
@@ -1,29 +1,32 @@
 version: '2'
 services:
   mariadb:
-      image: 'bitnami/mariadb:latest'
+      image: 'bitnami/mariadb:10.1'
       volumes:
         - 'mariadb_data:/bitnami'
       environment:
-        - MARIADB_USER=bn_wordpress
-        - MARIADB_DATABASE=bitnami_wordpress
-        - ALLOW_EMPTY_PASSWORD=yes
+        - MARIADB_ROOT_PASSWORD=${mariadb_root_password}
+        - MARIADB_USER=${mariadb_user}
+        - MARIADB_PASSWORD=${mariadb_user_password}
+        - MARIADB_DATABASE=${mariadb_database_name}
   wordpress:
-      image: 'bitnami/wordpress:latest'
-      ports:
-        - '${public_port}:80'
+      image: 'bitnami/wordpress:4'
       volumes:
         - 'wordpress_data:/bitnami'
       depends_on:
         - mariadb
       environment:
-        - MARIADB_HOST=mariadb
-        - MARIADB_PORT_NUMBER=3306
-        - WORDPRESS_DATABASE_USER=bn_wordpress
-        - WORDPRESS_DATABASE_NAME=bitnami_wordpress
-        - ALLOW_EMPTY_PASSWORD=yes
+        - WORDPRESS_DATABASE_NAME=${mariadb_database_name}
+        - WORDPRESS_DATABASE_USER=${mariadb_user} 
+        - WORDPRESS_DATABASE_PASSWORD=${mariadb_user_password}       
+        - WORDPRESS_USERNAME=${wordpress_username}
+        - WORDPRESS_PASSWORD=${wordpress_password}
+  wordpress-lb:
+    image: rancher/lb-service-haproxy:v0.7.5
+    ports:
+      - ${public_port}:${public_port}
 volumes:
   mariadb_data:
-    driver: rancher-nfs
+    driver: ${volume_driver}
   wordpress_data:
-    driver: rancher-nfs
\ No newline at end of file
+    driver: ${volume_driver}
\ No newline at end of file
diff --git a/templates/wordpress/1/rancher-compose.yml b/templates/wordpress/1/rancher-compose.yml
index 9ab1cd4..5b62eeb 100644
--- a/templates/wordpress/1/rancher-compose.yml
+++ b/templates/wordpress/1/rancher-compose.yml
@@ -1,4 +1,5 @@
-.catalog:
+version: '2'
+catalog:
   name: "Wordpress"
   version: "v0.2-bitnami"
   description: "Blog tool, publishing platform and CMS based on bitnami images"
@@ -11,4 +12,69 @@
       required: true
       default: "80"
       type: "int"
-wordpress:
+    - variable: mariadb_root_password
+      description: "MariaDB root password, set on first run"
+      label: "MariaDB Root Password"
+      required: true
+      default: "mariadb_my_root"
+      type: "string"
+    - variable: mariadb_user
+      description: "MariaDB database user, created on first run"
+      label: "MariaDB Database User"
+      required: true
+      default: "wordpress_user"
+      type: "string"
+    - variable: mariadb_user_password
+      description: "MariaDB database user password, set on first run"
+      label: "MariaDB Database User Password"
+      required: true
+      default: "wordpress_password"
+      type: "string"
+    - variable: wordpress_username
+      description: " WordPress application username"
+      label: "WordPress application password"
+      required: true
+      default: "admin"
+      type: "string"  
+    - variable: wordpress_password
+      description: "WordPress application password"
+      label: "WordPress application password"
+      required: true
+      default: "bitnami"
+      type: "string"       
+    - variable: volume_driver
+      description: "Volume driver to use with this service"
+      label: "Volume driver"
+      required: true
+      default: "local"
+      type: enum
+      options:
+        - local
+        - rancher-nfs
+        - rancher-efs
+        - rancher-ebs
+services:
+  wordpress-lb:
+    scale: 1
+    lb_config:
+      certs: []
+      port_rules:
+      - protocol: http
+        service: wordpress
+        source_port: ${public_port}
+        target_port: 80
+    health_check:
+      response_timeout: 2000
+      healthy_threshold: 2
+      port: 42
+      unhealthy_threshold: 3
+  wordpress:
+    scale: 1
+    retain_ip: true
+    health_check:
+     port: 80
+      interval: 5000
+      unhealthy_threshold: 3
+      request_line: 'GET / HTTP/1.0'
+      healthy_threshold: 2
+      response_timeout: 5000
\ No newline at end of file