fix(wordpress): fix ssl always being forced and plugins not installing (

#16)

images/wordpress/Dockerfile

@@ -76,16 +76,19 @@ COPY ./config/wordpress /tmp/wordpress
 # Copy nginx config
 COPY ./etc/nginx/http.d/* /etc/nginx/http.d/
 
+ENV PHP_VERSION=${PHP_VERSION}
 ENV WP_VERSION=${WP_VERSION}
 
-ENV ROOT_DIR=${ROOT_DIR}
-
 ###
 # Core
 ###
 ENV BASE_URL=localhost:8130
 ENV FULL_URL=https://${BASE_URL}
-ENV ROOT_DIR=/var/www/html
+ENV ROOT_DIR=${ROOT_DIR}
+ENV WITH_NGINX=0
+
+ENV TMP_PLUGINS_DIR="/tmp/plugins"
+ENV WP_PLUGINS_DIR="${ROOT_DIR}/wp-content/plugins"
 
 ###
 # Database

images/wordpress/config/wordpress/wp-cli.template.yml

@@ -22,9 +22,11 @@ config create:
 
     @ini_set('display_errors', ${DISPLAY_ERRORS:-0});
 
-    # SSL
-    define('FORCE_SSL_ADMIN', true);
-    $$_SERVER['HTTPS'] = 'on';
+    # Force SSL if the URL starts with https://
+    if (strpos('${WP_URL_REPLACE}', 'https://') === 0) {
+        define('FORCE_SSL_ADMIN', true);
+        $$_SERVER['HTTPS'] = 'on';
+    }
 
     # Other
     $$_SERVER['document_root'] = dirname(__FILE__);

images/wordpress/scripts/_install-plugins.sh

@@ -1,18 +1,37 @@
 install-plugins() {
   h1 "Linking, installing and activating plugins..."
 
+  PLUGINS_FOUND=$(find "$TMP_PLUGINS_DIR" -type d -mindepth 1 -maxdepth 1)
+
   link-paths "$TMP_PLUGINS_DIR" "$WP_PLUGINS_DIR"
 
   if [ -n "$WP_SKIP_PLUGINS" ]; then
     h2 "Skipping plugin installation because WP_SKIP_PLUGINS is set."
     return
   fi
 
-  for path in "$TMP_PLUGINS_DIR"/*/; do
-    plugin=$(basename "$path")
+  if [ -z "$PLUGINS_FOUND" ]; then
+    h2 "No local plugins to install."
+  else
+    h2 "Installing local plugins..."
+    for path in $PLUGINS_FOUND; do
+      plugin=$(basename "$path")
+
+      wp-activate plugin "$plugin"
+    done
+  fi
+
+  PLUGINS_LIST=$(echo "$WP_PLUGINS" | tr ',' '\n')
+
+  if [ -z "$PLUGINS_LIST" ]; then
+    h2 "No remote plugins to install."
+  else
+    h2 "Downloading and installing remote plugins..."
 
-    wp-activate plugin "$plugin"
-  done
+    for plugin in $PLUGINS_LIST; do
+      wp-activate plugin "$plugin"
+    done
+  fi
 
   h2 "Finished installing and activating plugins."
 }

images/wordpress/scripts/entrypoint.sh

@@ -2,9 +2,6 @@
 
 declare -i term_width=70
 
-export TMP_PLUGINS_DIR="/tmp/plugins"
-export WP_PLUGINS_DIR="$ROOT_DIR/wp-content/plugins"
-
 for script in /tmp/scripts/_*; do source $script; done
 
 # Start php fpm in the background in advance.