Skip to content

Commit 4194340

Browse files
committed
merge back apt-get update and install to keep them on the same layer
1 parent 2a02ed7 commit 4194340

2 files changed

Lines changed: 22 additions & 24 deletions

File tree

php-fpm/Dockerfile-5

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1111
ADD ./laravel.ini /usr/local/etc/php/conf.d
1212
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
1313

14-
RUN apt-get update
15-
1614
#
1715
#--------------------------------------------------------------------------
1816
# Software's Installation
@@ -23,16 +21,17 @@ RUN apt-get update
2321

2422
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2523
# "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
26-
RUN apt-get install -y --no-install-recommends \
27-
curl \
28-
libmemcached-dev \
29-
libz-dev \
30-
libpq-dev \
31-
libjpeg-dev \
32-
libpng12-dev \
33-
libfreetype6-dev \
34-
libssl-dev \
35-
libmcrypt-dev
24+
RUN apt-get update \
25+
&& apt-get install -y --no-install-recommends \
26+
curl \
27+
libmemcached-dev \
28+
libz-dev \
29+
libpq-dev \
30+
libjpeg-dev \
31+
libpng12-dev \
32+
libfreetype6-dev \
33+
libssl-dev \
34+
libmcrypt-dev
3635

3736
# Install the PHP mcrypt extention
3837
RUN docker-php-ext-install mcrypt

php-fpm/Dockerfile-70

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1111
ADD ./laravel.ini /usr/local/etc/php/conf.d
1212
ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
1313

14-
RUN apt-get update
15-
1614
#
1715
#--------------------------------------------------------------------------
1816
# Software's Installation
@@ -23,16 +21,17 @@ RUN apt-get update
2321

2422
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2523
# "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
26-
RUN apt-get install -y --no-install-recommends \
27-
curl \
28-
libmemcached-dev \
29-
libz-dev \
30-
libpq-dev \
31-
libjpeg-dev \
32-
libpng12-dev \
33-
libfreetype6-dev \
34-
libssl-dev \
35-
libmcrypt-dev
24+
RUN apt-get update \
25+
&& apt-get install -y --no-install-recommends \
26+
curl \
27+
libmemcached-dev \
28+
libz-dev \
29+
libpq-dev \
30+
libjpeg-dev \
31+
libpng12-dev \
32+
libfreetype6-dev \
33+
libssl-dev \
34+
libmcrypt-dev
3635

3736
# Install the PHP mcrypt extention
3837
RUN docker-php-ext-install mcrypt

0 commit comments

Comments
 (0)