Skip to content

Commit

Permalink
Merge pull request #23 from devilbox/release-0.29
Browse files Browse the repository at this point in the history
Consolidate Dockerfile with other HTTPD projects
  • Loading branch information
cytopia authored Mar 3, 2019
2 parents 3f647e2 + 62923ca commit 9bfa71b
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ LABEL \
vendor="devilbox" \
license="MIT"


###
### Build arguments
###
Expand Down Expand Up @@ -36,10 +37,8 @@ ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"


###
### Installation
### Install required packages
###

# required packages
RUN set -x \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -80,7 +79,10 @@ RUN set -x \
${BUILD_DEPS} \
&& rm -rf /var/lib/apt/lists/*

# Add custom config directive to httpd server

###
### Configure Apache
###
RUN set -x \
&& ( \
echo "ServerName localhost"; \
Expand All @@ -107,7 +109,10 @@ RUN set -x \
echo "HTTPProtocolOptions unsafe"; \
) >> /usr/local/apache2/conf/httpd.conf

# create directories

###
### Create directories
###
RUN set -x \
&& mkdir -p /etc/httpd-custom.d \
&& mkdir -p /etc/httpd/conf.d \
Expand Down

0 comments on commit 9bfa71b

Please sign in to comment.