Skip to content

Commit db9a320

Browse files
committed
Clean up a few extraneous bits leftover from our php:apache transition
1 parent bb7a6d6 commit db9a320

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM php:5.6-apache
22

3+
RUN apt-get update && apt-get install -y rsync && rm -r /var/lib/apt/lists/*
4+
35
RUN a2enmod rewrite
46

5-
RUN rm -rf /var/www/html && mkdir /var/www/html
67
VOLUME /var/www/html
7-
WORKDIR /var/www/html
88

99
ENV WORDPRESS_VERSION 4.0.0
1010
ENV WORDPRESS_UPSTREAM_VERSION 4.0
@@ -14,6 +14,6 @@ RUN curl -SL http://wordpress.org/wordpress-${WORDPRESS_UPSTREAM_VERSION}.tar.gz
1414

1515
COPY docker-entrypoint.sh /entrypoint.sh
1616

17+
# grr, ENTRYPOINT resets CMD now
1718
ENTRYPOINT ["/entrypoint.sh"]
18-
EXPOSE 80
1919
CMD ["apache2", "-DFOREGROUND"]

docker-apache.conf

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)