Updated Dockerfile

Author: suzel

Dockerfile

@@ -1,60 +1,48 @@
-FROM ubuntu:14.04
-MAINTAINER Sukru Uzel <uzelsukru@gmail.com>
-
-# Keep upstart
-RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl
-
-# Set no tty
-ENV DEBIAN_FRONTEND noninteractive
-ENV MYSQL_DB pw_db
-ENV MYSQL_USER pw_user
-ENV MYSQL_PASS pw_pass
-
-# Update System
-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 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 && \
-    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 && \
-    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 && cd ProcessWire/ && rm -rf .git
-
-# Supervisor Config
-RUN easy_install supervisor
-ADD ./config/supervisord.conf /etc/supervisord.conf
-
-# Volume
-VOLUME ["/var/lib/mysql", "/usr/share/nginx"]
+FROM ubuntu:16.04
+MAINTAINER Sukru Uzel <sukru.uzel@gmail.com>
+
+# Packages installation
+RUN apt-get update && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y \
+    git \
+    apache2 \
+    libapache2-mod-php7.0 \
+    php7.0 \
+    php7.0-cli \
+    php7.0-gd \
+    php7.0-json \
+    php7.0-ldap \
+    php7.0-mbstring \
+    php7.0-mysql \
+    php7.0-xml \
+    php7.0-xsl \
+    php7.0-zip \
+    php7.0-soap
+
+# Update the default apache site with the config we created.
+COPY config/apache/default.conf /etc/apache2/sites-available/000-default.conf
+RUN a2enmod rewrite
+
+# Update php.ini
+RUN sed -ri 's/^display_errors\s*=\s*Off/display_errors = On/g' /etc/php/7.0/apache2/php.ini
+RUN sed -ri 's/^display_errors\s*=\s*Off/display_errors = On/g' /etc/php/7.0/cli/php.ini
+
+# Install ProcessWire
+RUN git clone git://github.com/ryancramerdesign/ProcessWire.git -b master /var/www/pw
+RUN chown -R www-data:www-data /var/www/pw
 
 # Expose
 EXPOSE 80
-EXPOSE 3306
 
-# Startup Script
-ADD ./scripts/start.sh /scripts/start.sh
-RUN chmod 755 /scripts/start.sh
-CMD ["/bin/bash", "/scripts/start.sh"]
+# Volume
+VOLUME ["/var/www/pw"]
 
 # Clean
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/www/pw/.git
+
+# Init
+ADD scripts/init.sh /init.sh
+RUN chmod +x /init.sh
+CMD ["/init.sh"]

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Şükrü Uzel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,4 @@
 # 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/)
 
 A Docker container for Processwire Projects.
@@ -25,20 +24,16 @@ $ docker build -t suzel/docker-processwire .
 Start your image binding external port 80 in all interfaces to your container:
 
 ```sh
-$ docker run --name webproject \
-             -v $PWD:/usr/share/nginx \
+$ docker run --name pw-project \
+             -v $PWD:/var/www/pw \
              -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 ip address>
+$ open http://<docker_ip_address>
 ```
 
 ## Documentation

config/apache/default.conf

@@ -0,0 +1,35 @@
+<VirtualHost *:80>
+	# The ServerName directive sets the request scheme, hostname and port that
+	# the server uses to identify itself. This is used when creating
+	# redirection URLs. In the context of virtual hosts, the ServerName
+	# specifies what hostname must appear in the request's Host: header to
+	# match this virtual host. For the default virtual host (this file) this
+	# value is not decisive as it is used as a last resort host regardless.
+	# However, you must set it for any further virtual host explicitly.
+	#ServerName www.example.com
+
+	ServerAdmin webmaster@localhost
+	DocumentRoot /var/www/pw
+
+    <Directory /var/www/pw>
+        Options Indexes FollowSymLinks MultiViews
+		AllowOverride All
+        Require all granted
+    </Directory>
+
+	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+	# error, crit, alert, emerg.
+	# It is also possible to configure the loglevel for particular
+	# modules, e.g.
+	#LogLevel info ssl:warn
+
+    ErrorLog /dev/stdout
+    CustomLog /dev/stdout combined
+
+	# For most configuration files from conf-available/, which are
+	# enabled or disabled at a global level, it is possible to
+	# include a line for only one particular virtual host. For example the
+	# following line enables the CGI configuration for this host only
+	# after it has been globally disabled with "a2disconf".
+	#Include conf-available/serve-cgi-bin.conf
+</VirtualHost>

config/nginx-site.conf

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+source /etc/apache2/envvars
+exec apache2 -D FOREGROUND