From 7cd701b5513488f36e819a2ff64b9f44dd8dfc98 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 9 May 2017 13:17:43 -0700 Subject: [PATCH] Replace "apache2-bin apache2.2-common" with "apache2" The "apache2.2-common" package is already pulling in "apache2", which pulls in "apache2-bin" among other things, so let's simplify this block. --- 5.6/apache/Dockerfile | 5 ++++- 7.0/apache/Dockerfile | 5 ++++- 7.1/apache/Dockerfile | 5 ++++- apache-Dockerfile-block-1 | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 1ec5370f..0dafab6b 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -30,7 +30,10 @@ ENV PHP_INI_DIR /usr/local/etc/php RUN mkdir -p $PHP_INI_DIR/conf.d #### -RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apache2 \ + && rm -rf /var/lib/apt/lists/* ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 38f15369..08d58b73 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -30,7 +30,10 @@ ENV PHP_INI_DIR /usr/local/etc/php RUN mkdir -p $PHP_INI_DIR/conf.d #### -RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apache2 \ + && rm -rf /var/lib/apt/lists/* ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index eb7aa4e2..85c08767 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -30,7 +30,10 @@ ENV PHP_INI_DIR /usr/local/etc/php RUN mkdir -p $PHP_INI_DIR/conf.d #### -RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apache2 \ + && rm -rf /var/lib/apt/lists/* ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1 index cbfd1e44..eacbba05 100644 --- a/apache-Dockerfile-block-1 +++ b/apache-Dockerfile-block-1 @@ -1,4 +1,7 @@ -RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apache2 \ + && rm -rf /var/lib/apt/lists/* ENV APACHE_CONFDIR /etc/apache2 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars