Updated scripts.

Author: suzel

.dockerignore

@@ -0,0 +1,5 @@
+config/
+scripts/
+.gitignore
+docker-test.sh
+README.md

.gitignore

@@ -1,9 +1,10 @@
-### OSX
-
-.DS_Store
+### Mac
 ._*
+.DS_Store
+.Spotlight-V100
+.Trashes
 
-### IDE
-
+### Intellij
 .idea/
-*.iml
+*.iml
+*.iws

Dockerfile

@@ -2,53 +2,50 @@ FROM ubuntu:14.04
 MAINTAINER Sukru Uzel <uzelsukru@gmail.com>
 
 # Keep upstart
-RUN dpkg-divert --local --rename --add /sbin/initctl
-RUN ln -sf /bin/true /sbin/initctl
+RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl
 
 # Set no tty
 ENV DEBIAN_FRONTEND noninteractive
-ENV MYSQL_DB processwire
-ENV MYSQL_USER processwire
-ENV MYSQL_PASS processwire
+ENV MYSQL_DB pw_db
+ENV MYSQL_USER pw_user
+ENV MYSQL_PASS pw_pass
 
 # Update System
-RUN apt-get update
-RUN apt-get -y upgrade
+RUN apt-get update && apt-get -y upgrade
 
 # Basic Requirements
 RUN apt-get install -y pwgen --force-yes python-setuptools curl git unzip \
-mysql-server mysql-client \
-nginx \
-php5-fpm php5-mysql php-apc php5-cli php5-curl php5-gd php5-mcrypt php5-intl  \
-php5-imap php5-tidy php5-imagick php5-memcache php5-xmlrpc php5-xsl
+    mysql-server mysql-client \
+    nginx \
+    php5-fpm php5-mysql php-apc php5-cli php5-curl php5-gd php5-mcrypt php5-intl  \
+    php5-imap php5-tidy php5-imagick php5-memcache php5-xmlrpc php5-xsl
 
 # MySQL Config
 RUN sed -i -e"s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf
 
 # Nginx Config
-RUN sed -i -e"s/keepalive_timeout\s*65/keepalive_timeout 2/" /etc/nginx/nginx.conf
-RUN sed -i -e"s/keepalive_timeout 2/keepalive_timeout 2;\n\tclient_max_body_size 100m/" /etc/nginx/nginx.conf
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
+RUN sed -i -e"s/keepalive_timeout\s*65/keepalive_timeout 2/" /etc/nginx/nginx.conf && \
+    sed -i -e"s/keepalive_timeout 2/keepalive_timeout 2;\n\tclient_max_body_size 100m/" /etc/nginx/nginx.conf && \
+    echo "daemon off;" >> /etc/nginx/nginx.conf
 ADD ./config/nginx-site.conf /etc/nginx/sites-available/default
 
 # PHP Config
-RUN sed -i -e "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g" /etc/php5/fpm/php.ini
-RUN sed -i -e "s/upload_max_filesize\s*=\s*2M/upload_max_filesize = 100M/g" /etc/php5/fpm/php.ini
-RUN sed -i -e "s/post_max_size\s*=\s*8M/post_max_size = 100M/g" /etc/php5/fpm/php.ini
-RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf
-RUN sed -i -e "s/;catch_workers_output\s*=\s*yes/catch_workers_output = yes/g" /etc/php5/fpm/pool.d/www.conf
-RUN find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
+RUN sed -i -e "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g" /etc/php5/fpm/php.ini && \
+    sed -i -e "s/upload_max_filesize\s*=\s*2M/upload_max_filesize = 100M/g" /etc/php5/fpm/php.ini && \
+    sed -i -e "s/post_max_size\s*=\s*8M/post_max_size = 100M/g" /etc/php5/fpm/php.ini && \
+    sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.conf && \
+    sed -i -e "s/;catch_workers_output\s*=\s*yes/catch_workers_output = yes/g" /etc/php5/fpm/pool.d/www.conf && \
+    find /etc/php5/cli/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
 
 # ProcessWire Install
-RUN git clone git://github.com/ryancramerdesign/ProcessWire.git -b master
-RUN cd ProcessWire/ && rm -rf .git
+RUN git clone git://github.com/ryancramerdesign/ProcessWire.git -b master && cd ProcessWire/ && rm -rf .git
 
 # Supervisor Config
 RUN easy_install supervisor
 ADD ./config/supervisord.conf /etc/supervisord.conf
 
 # Volume
-VOLUME ["/usr/share/nginx"]
+VOLUME ["/var/lib/mysql", "/usr/share/nginx"]
 
 # Expose
 EXPOSE 80

README.md

@@ -1,4 +1,4 @@
-# Docker ProcessWire
+# ProcessWire (Docker Image)
 
 [![Go to Docker Hub](https://img.shields.io/badge/Docker%20Hub-%E2%86%92-blue.svg)](https://hub.docker.com/r/suzel/docker-processwire/)
 
@@ -12,7 +12,7 @@ The easiest way to get this docker image installed is to pull the latest version
 $ docker pull suzel/docker-processwire
 ```
 
-Build the docker-processwire:
+or build from scratch:
 
 ```sh
 $ git clone https://github.com/suzel/docker-processwire.git
@@ -27,15 +27,20 @@ Start your image binding external port 80 in all interfaces to your container:
 ```sh
 $ docker run --name webproject \
              -v $PWD:/usr/share/nginx \
-             -p 80:80 -p 3306:3306 \
-             -e MYSQL_DB=processwire \
-             -e MYSQL_USER=processwire \
-             -e MYSQL_PASS=processwire \
+             -p 80:80 \
+             -p 3306:3306 \
+             -e MYSQL_DB=pw_db \
+             -e MYSQL_USER=pw_user \
+             -e MYSQL_PASS=pw_pass \
              -d suzel/docker-processwire
 ```
 
 You can the visit the following URL in a browser on your host machine to get started:
 
 ```
-open http://$(docker-machine ip default):80
-```
+open http://$(docker-machine ip default)
+```
+
+## Documentation
+
+* [ProcessWire Documentation](https://processwire.com/docs/)

docker-test.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+docker-machine start default
+eval "$(docker-machine env default)"
+
+docker build -t suzel/docker-processwire .
+
+docker stop webproject && docker rm webproject
+
+docker run --name webproject \
+           -v $PWD:/usr/share/nginx \
+           -p 80:80 \
+           -p 3306:3306 \
+           -e MYSQL_DB=pw_db \
+           -e MYSQL_USER=pw_user \
+           -e MYSQL_PASS=pw_pass \
+           -d suzel/docker-processwire
+
+open http://$(docker-machine ip default)
+docker exec -it webproject bash