Merge branch 'master' of https://github.com/etopian/alpine-php-wordpress

Author: etopian

Diff for: Dockerfile

@@ -20,7 +20,7 @@ RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositor
     php7-pdo_mysql php7-mysqli php7-session \
     php7-gd php7-iconv php7-mcrypt \
     php7-curl php7-opcache php7-ctype php7-apcu \
-    php7-intl php7-bcmath php7-dom php7-xmlreader mysql-client openssh-client git curl rsync && apk add -u --no-cache musl && apk --update --no-cache add tar
+    php7-intl php7-bcmath php7-mbstring php7-dom php7-xmlreader mysql-client openssh-client git curl rsync && apk add -u --no-cache musl && apk --update --no-cache add tar
 
 RUN rm -rf /var/cache/apk/*
 

Diff for: README.md

@@ -1,18 +1,17 @@
-##### This image is being maintained. No need to fork it. Upgrade your site using the upgrade strategy on dockerwordpress.com
+##### This image is being maintained. Fork it and change it fit your needs. Upgrade your site using the upgrade strategy on wordpressdocker.com
 
-http://www.dockerwordpress.com/docker/upgrading-wordpress-docker
+Full documentation for this project can be found here: http://www.wordpressdocker.com/
 
 # Lightweight WordPress PHP7 PHP-FPM7 & Nginx Docker Image
 
 Lightwight Docker image for the (latest) PHP-FPM and Nginx to run WordPress based on [AlpineLinux](http://alpinelinux.org)
 
 * Image size only ~131MB !
 * Very new packages (alpine:edge) 2016-07-21:
-  * [PHP](http://pkgs.alpinelinux.org/package/main/x86/php) 7.0.8
-  * [Nginx](http://pkgs.alpinelinux.org/package/main/x86/nginx) 1.10.1
+  * [PHP](http://pkgs.alpinelinux.org/package/main/x86/php) 7.0.13
+  * [Nginx](http://pkgs.alpinelinux.org/package/main/x86/nginx) nginx/1.10.2
   * Memory usage is around 50mb on a simple install.
-  
-  
+
 ## A simple example
 ### Say you want to run a single site on a VPS with Docker
 
@@ -44,7 +43,7 @@ mkdir -p /data/sites/etopian.net/htdocs
 sudo docker run -e VIRTUAL_HOST=etopian.net,www.etopian.net -v /data/sites/etopian.net:/DATA etopian/alpine-php-wordpress
 ```
 
-Populate /data/sites/etopian.com/htdocs and  /data/sites/etopian.net/htdocs with your WP files. See http://www.dockerwordpress.com if you need help on how to configure your database.
+Populate /data/sites/etopian.com/htdocs and  /data/sites/etopian.net/htdocs with your WP files. See http://www.wordpressdocker.com if you need help on how to configure your database.
 
 The following user and group id are used, the files should be set to this:
 User ID: 
@@ -73,10 +72,6 @@ cd /DATA/htdocs
 wp-cli cli
 ```
 
-### Fail2Ban
-
-We are adding the ability to use Fail2Ban on here, however it does not yet work. Will update once it does.
-
 ### Multisite
 
 For each multisite you need to give the domain as the -e VIRTUAL_HOST parameter. For instance VIRTUAL_HOST=site1.com,www.site1.com,site2.com,www.site2.com ... if you wish to add more sites you need to recreate the container.
@@ -94,184 +89,14 @@ To modify php.ini variable, simply edit php-fpm.ini and add php_flag[variable] =
 php_flag[display_errors] = on
 ```
 
-### PHP Modules
-#### List of available modules in Alpine Linux, not all these are installed.
-##### In order to install a php module do, (leave out the version number i.e. -5.6.11-r0
-```
-docker exec <image_id> apk add <pkg_name>
-docker restart <image_name>
-```
-Example:
-
-```
-docker exec <image_id> apk add php-soap
-docker restart <image_name>
-```
-
-
-php-soap-5.6.11-r0
-
-php-openssl-5.6.11-r0
-
-php-gmp-5.6.11-r0
-
-php-phar-5.6.11-r0
-
-php-embed-5.6.11-r0
-
-php-pdo_odbc-5.6.11-r0
-
-php-mysqli-5.6.11-r0
-
-php-common-5.6.11-r0
-
-php-ctype-5.6.11-r0
-
-php-fpm-5.6.11-r0
-
-php-shmop-5.6.11-r0
-
-php-xsl-5.6.11-r0
-
-php-curl-5.6.11-r0
-
-php-pear-net_idna2-0.1.1-r0
-
-php-json-5.6.11-r0
-
-php-dom-5.6.11-r0
-
-php-pspell-5.6.11-r0
-
-php-sockets-5.6.11-r0
-
-php-pear-mdb2-driver-pgsql-2.5.0b5-r0
-
-php-pdo-5.6.11-r0
-
-phpldapadmin-1.2.3-r3
-
-php-pear-5.6.11-r0
-
-php-phpmailer-5.2.0-r0
-
-phpmyadmin-doc-4.4.10-r0
-
-php-cli-5.6.11-r0
-
-php-zip-5.6.11-r0
-
-php-pgsql-5.6.11-r0
-
-php-sysvshm-5.6.11-r0
-
-php-imap-5.6.11-r0
-
-php-intl-5.6.11-r0
-
-php-embed-5.6.11-r0
-
-php-zlib-5.6.11-r0
-
-php-phpdbg-5.6.11-r0
-
-php-sysvsem-5.6.11-r0
-
-phpmyadmin-4.4.10-r0
-
-php-mysql-5.6.11-r0
-
-php-sqlite3-5.6.11-r0
-
-php-cgi-5.6.11-r0
-
-php-apcu-4.0.7-r1
-
-php-snmp-5.6.11-r0
-
-php-pdo_pgsql-5.6.11-r0
-
-php-xml-5.6.11-r0
-
-php-wddx-5.6.11-r0
-
-php-sysvmsg-5.6.11-r0
-
-php-enchant-5.6.11-r0
-
-php-bcmath-5.6.11-r0
-
-php-pear-mail_mime-1.8.9-r0
-
-php-apache2-5.6.11-r0
-
-php-gd-5.6.11-r0
-
-php-pear-mdb2-driver-sqlite-2.5.0b5-r0
-
-php-xcache-3.2.0-r1
-
-php-odbc-5.6.11-r0
-
-php-mailparse-2.1.6-r2
-
-php-ftp-5.6.11-r0
-
-perl-php-serialization-0.34-r1
-
-php-exif-5.6.11-r0
-
-php-pdo_mysql-5.6.11-r0
-
-php-ldap-5.6.11-r0
-
-php-pear-mdb2-2.5.0b5-r0
-
-php-dbg-5.6.11-r0
-
-php-pear-net_smtp-1.6.2-r0
-
-php-opcache-5.6.11-r0
-
-php-pdo_sqlite-5.6.11-r0
-
-php-posix-5.6.11-r0
-
-php-dba-5.6.11-r0
-
-php-iconv-5.6.11-r0
-
-php-gettext-5.6.11-r0
-
-php-xmlreader-5.6.11-r0
-
-php-5.6.11-r0
-
-php-xmlrpc-5.6.11-r0
-
-php-bz2-5.6.11-r0
-
-perl-php-serialization-doc-0.34-r1
-
-php-mcrypt-5.6.11-r0
-
-php-memcache-3.0.8-r3
-
-xapian-bindings-php-1.2.21-r1
-
-php-pdo_dblib-5.6.11-r0
-
-php-phalcon-2.0.3-r0
-
-php-dev-5.6.11-r0
+Additional documentation on http://www.wordpressdocker.com
 
-php-doc-5.6.11-r0
+## Questions or Support
 
-php-mssql-5.6.11-r0
+https://gitter.im/etopian/devoply
 
-php-calendar-5.6.11-r0
+## Docker WordPress Control Panel
 
-php-pear-mdb2-driver-mysqli-2.5.0b5-r0
+DEVOPly is a free hosting control panel which does everything taught in this tutorial automatically and much more, backups, staging/dev/prod, code editor, Github/Bitbucket deployments, DNS, WordPress Management. https://www.devoply.com
 
-php-pear-mdb2-driver-mysql-2.5.0b5-r0