Merge pull request #152 from bryanlatten/feature-unbreak-pecl

Dockerfile: unbreak pecl placement
behance · Dec 6, 2017 · 8cd61e2 · 8cd61e2
2 parents 9129f78 + 1726b69
commit 8cd61e2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Dockerfile-56 b/Dockerfile-56
@@ -65,7 +65,7 @@ RUN apt-get update -q && \
             php7.2-common \
             php7.2-json \
     && \
-    apt-get -yqq install --no-install-recommends \
+    apt-get -yqq install \
         libgearman8 \
         php5.6 \
         php5.6-apcu \

diff --git a/Dockerfile-70 b/Dockerfile-70
@@ -65,7 +65,7 @@ RUN apt-get update -q && \
             php7.2-common \
             php7.2-json \
     && \
-    apt-get -yqq install --no-install-recommends \
+    apt-get -yqq install \
         libgearman8 \
         php7.0 \
         php7.0-apcu \

diff --git a/Dockerfile-71 b/Dockerfile-71
@@ -65,7 +65,7 @@ RUN apt-get update -q && \
             php7.2-common \
             php7.2-json \
     && \
-    apt-get -yqq install --no-install-recommends \
+    apt-get -yqq install \
         libgearman8 \
         php7.1 \
         php7.1-apcu \

diff --git a/Dockerfile-72 b/Dockerfile-72
@@ -51,6 +51,13 @@ RUN /bin/bash -e /security_updates.sh && \
     && \
     /bin/bash /clean.sh
 
+# TODO: fix these packages:
+# php7.2-mcrypt
+# php-xdebug
+# newrelic-php5
+# newrelic-php5-common
+# newrelic-daemon
+
 # Add PHP and support packages \
 RUN apt-get update -q && \
     # Ensure PHP 5.5 + 5.6 + 7.1 don't accidentally get added by PPA
@@ -63,16 +70,9 @@ RUN apt-get update -q && \
             php7.0-json \
             php7.1-cli \
             php7.1-common \
-            php7.1-json
-
-# TODO: fix these packages:
-# php7.2-mcrypt
-# php-xdebug
-# newrelic-php5
-# newrelic-php5-common
-# newrelic-daemon
-
-RUN apt-get -yqq install --no-install-recommends \
+            php7.1-json \
+    && \
+    apt-get -yqq install \
         libgearman8 \
         php7.2 \
         php7.2-apcu \