Merge pull request WordPress#15 from infosiftr/clean-wordpress

Update to use the updated, official php:apache image.

Author: yosifkit

Dockerfile

@@ -1,37 +1,7 @@
-FROM debian:wheezy
+FROM php:5.6-apache
 
-RUN apt-get update && apt-get install -y \
-		apache2 \
-		curl \
-		libapache2-mod-php5 \
-		php5-curl \
-		php5-gd \
-		php5-mysql \
-		rsync \
-		wget \
-	&& rm -rf /var/lib/apt/lists/*
 RUN a2enmod rewrite
 
-# copy a few things from apache's init script that it requires to be setup
-ENV APACHE_CONFDIR /etc/apache2
-ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
-# and then a few more from $APACHE_CONFDIR/envvars itself
-ENV APACHE_RUN_USER www-data
-ENV APACHE_RUN_GROUP www-data
-ENV APACHE_RUN_DIR /var/run/apache2
-ENV APACHE_PID_FILE $APACHE_RUN_DIR/apache2.pid
-ENV APACHE_LOCK_DIR /var/lock/apache2
-ENV APACHE_LOG_DIR /var/log/apache2
-ENV LANG C
-RUN mkdir -p $APACHE_RUN_DIR $APACHE_LOCK_DIR $APACHE_LOG_DIR
-
-# make CustomLog (access log) go to stdout instead of files
-#  and ErrorLog to stderr
-RUN find "$APACHE_CONFDIR" -type f -exec sed -ri ' \
-	s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
-	s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
-' '{}' ';'
-
 RUN rm -rf /var/www/html && mkdir /var/www/html
 VOLUME /var/www/html
 WORKDIR /var/www/html
@@ -42,9 +12,6 @@ ENV WORDPRESS_UPSTREAM_VERSION 4.0
 # upstream tarballs include ./wordpress/ so this gives us /usr/src/wordpress
 RUN curl -SL http://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz | tar -xzC /usr/src/
 
-COPY docker-apache.conf /etc/apache2/sites-available/wordpress
-RUN a2dissite 000-default && a2ensite wordpress
-
 COPY docker-entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]