Skip to content

Commit e481325

Browse files
bestlongbestlong
committed
reformat and show gd info
1 parent 244eeee commit e481325

File tree

6 files changed

+166
-169
lines changed

6 files changed

+166
-169
lines changed

‎Dockerfile-56

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,33 @@ ENV DEBIAN_FRONTEND noninteractive
2121

2222
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2323
# "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
24-
RUN set -xe && \
25-
apt-get update && \
26-
apt-get upgrade -y && \
27-
apt-get install -y --no-install-recommends \
28-
curl \
29-
libmemcached-dev \
30-
libz-dev \
31-
libpq-dev \
32-
libjpeg-dev \
33-
libpng-dev \
34-
libfreetype6-dev \
35-
libssl-dev \
36-
libmcrypt-dev
37-
38-
# Install the PHP mcrypt extention
39-
RUN docker-php-ext-install mcrypt
40-
41-
# Install the PHP pdo_mysql extention
42-
RUN docker-php-ext-install mysqli \
43-
&& docker-php-ext-install pdo_mysql
44-
# Install the PHP pdo_pgsql extention
45-
RUN docker-php-ext-install pdo_pgsql
46-
47-
#####################################
48-
# gd:
49-
#####################################
50-
51-
# Install the PHP gd library
52-
RUN docker-php-ext-install gd && \
24+
RUN set -eux; \
25+
apt-get update; \
26+
apt-get upgrade -y; \
27+
apt-get install -y --no-install-recommends \
28+
curl \
29+
libmemcached-dev \
30+
libz-dev \
31+
libpq-dev \
32+
libjpeg-dev \
33+
libpng-dev \
34+
libfreetype6-dev \
35+
libssl-dev \
36+
libmcrypt-dev; \
37+
# cleanup
38+
rm -rf /var/lib/apt/lists/*
39+
40+
RUN set -eux; \
41+
# Install the PHP mcrypt extention
42+
docker-php-ext-install mcrypt; \
43+
# Install the PHP pdo_mysql extention
44+
docker-php-ext-install pdo_mysql mysqli; \
45+
# Install the PHP pdo_pgsql extention
46+
docker-php-ext-install pdo_pgsql; \
47+
# Install the PHP gd library
5348
docker-php-ext-configure gd \
54-
--enable-gd-native-ttf \
55-
--with-jpeg-dir=/usr/lib \
56-
--with-freetype-dir=/usr/include/freetype2 && \
57-
docker-php-ext-install gd
49+
--enable-gd-native-ttf \
50+
--with-jpeg-dir=/usr/lib \
51+
--with-freetype-dir=/usr/include/freetype2; \
52+
docker-php-ext-install gd; \
53+
php -r 'var_dump(gd_info());'

‎Dockerfile-70

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,33 @@ ENV DEBIAN_FRONTEND noninteractive
2121

2222
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2323
# "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
24-
RUN set -xe && \
25-
apt-get update && \
26-
apt-get upgrade -y && \
27-
apt-get install -y --no-install-recommends \
28-
curl \
29-
libmemcached-dev \
30-
libz-dev \
31-
libpq-dev \
32-
libjpeg-dev \
33-
libpng-dev \
34-
libfreetype6-dev \
35-
libssl-dev \
36-
libmcrypt-dev
37-
38-
# Install the PHP mcrypt extention
39-
RUN docker-php-ext-install mcrypt
40-
41-
# Install the PHP pdo_mysql extention
42-
RUN docker-php-ext-install pdo_mysql
43-
44-
# Install the PHP pdo_pgsql extention
45-
RUN docker-php-ext-install pdo_pgsql
46-
47-
#####################################
48-
# gd:
49-
#####################################
50-
51-
# Install the PHP gd library
52-
RUN docker-php-ext-configure gd \
53-
--enable-gd-native-ttf \
54-
--with-jpeg-dir=/usr/lib \
55-
--with-freetype-dir=/usr/include/freetype2 && \
56-
docker-php-ext-install gd
24+
RUN set -eux; \
25+
apt-get update; \
26+
apt-get upgrade -y; \
27+
apt-get install -y --no-install-recommends \
28+
curl \
29+
libmemcached-dev \
30+
libz-dev \
31+
libpq-dev \
32+
libjpeg-dev \
33+
libpng-dev \
34+
libfreetype6-dev \
35+
libssl-dev \
36+
libmcrypt-dev; \
37+
# cleanup
38+
rm -rf /var/lib/apt/lists/*
39+
40+
RUN set -eux; \
41+
# Install the PHP mcrypt extention
42+
docker-php-ext-install mcrypt; \
43+
# Install the PHP pdo_mysql extention
44+
docker-php-ext-install pdo_mysql; \
45+
# Install the PHP pdo_pgsql extention
46+
docker-php-ext-install pdo_pgsql; \
47+
# Install the PHP gd library
48+
docker-php-ext-configure gd \
49+
--enable-gd-native-ttf \
50+
--with-jpeg-dir=/usr/lib \
51+
--with-freetype-dir=/usr/include/freetype2; \
52+
docker-php-ext-install gd; \
53+
php -r 'var_dump(gd_info());'

‎Dockerfile-71

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,33 @@ ENV DEBIAN_FRONTEND noninteractive
2121

2222
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2323
# "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
24-
RUN set -xe && \
25-
apt-get update && \
26-
apt-get upgrade -y && \
27-
apt-get install -y --no-install-recommends \
28-
curl \
29-
libmemcached-dev \
30-
libz-dev \
31-
libpq-dev \
32-
libjpeg-dev \
33-
libpng-dev \
34-
libfreetype6-dev \
35-
libssl-dev \
36-
libmcrypt-dev \
37-
&& rm -rf /var/lib/apt/lists/*
24+
RUN set -eux; \
25+
apt-get update; \
26+
apt-get upgrade -y; \
27+
apt-get install -y --no-install-recommends \
28+
curl \
29+
libmemcached-dev \
30+
libz-dev \
31+
libpq-dev \
32+
libjpeg-dev \
33+
libpng-dev \
34+
libfreetype6-dev \
35+
libssl-dev \
36+
libmcrypt-dev; \
37+
# cleanup
38+
rm -rf /var/lib/apt/lists/*
3839

39-
# Install the PHP mcrypt extention
40-
RUN docker-php-ext-install mcrypt \
41-
# Install the PHP pdo_mysql extention
42-
&& docker-php-ext-install pdo_mysql \
43-
# Install the PHP pdo_pgsql extention
44-
&& docker-php-ext-install pdo_pgsql \
45-
# Install the PHP gd library
46-
&& docker-php-ext-configure gd \
47-
--enable-gd-native-ttf \
48-
--with-jpeg-dir=/usr/lib \
49-
--with-freetype-dir=/usr/include/freetype2 && \
50-
docker-php-ext-install gd
40+
RUN set -eux; \
41+
# Install the PHP mcrypt extention
42+
docker-php-ext-install mcrypt; \
43+
# Install the PHP pdo_mysql extention
44+
docker-php-ext-install pdo_mysql; \
45+
# Install the PHP pdo_pgsql extention
46+
docker-php-ext-install pdo_pgsql; \
47+
# Install the PHP gd library
48+
docker-php-ext-configure gd \
49+
--enable-gd-native-ttf \
50+
--with-jpeg-dir=/usr/lib \
51+
--with-freetype-dir=/usr/include/freetype2; \
52+
docker-php-ext-install gd; \
53+
php -r 'var_dump(gd_info());'

‎Dockerfile-72

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,30 @@ ENV DEBIAN_FRONTEND noninteractive
2121

2222
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2323
# "libpng-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
24-
RUN set -xe && \
25-
apt-get update && \
26-
apt-get upgrade -y && \
27-
apt-get install -y --no-install-recommends \
28-
curl \
29-
libmemcached-dev \
30-
libz-dev \
31-
libpq-dev \
32-
libjpeg-dev \
33-
libpng-dev \
34-
libfreetype6-dev \
35-
libssl-dev \
36-
libmcrypt-dev \
37-
&& rm -rf /var/lib/apt/lists/*
24+
RUN set -eux; \
25+
apt-get update; \
26+
apt-get upgrade -y; \
27+
apt-get install -y --no-install-recommends \
28+
curl \
29+
libmemcached-dev \
30+
libz-dev \
31+
libpq-dev \
32+
libjpeg-dev \
33+
libpng-dev \
34+
libfreetype6-dev \
35+
libssl-dev \
36+
libmcrypt-dev; \
37+
# cleanup
38+
rm -rf /var/lib/apt/lists/*
3839

39-
40-
41-
# Install the PHP pdo_mysql extention
42-
RUN docker-php-ext-install pdo_mysql \
43-
# Install the PHP pdo_pgsql extention
44-
&& docker-php-ext-install pdo_pgsql \
45-
# Install the PHP gd library
46-
&& docker-php-ext-configure gd \
47-
--with-jpeg-dir=/usr/lib \
48-
--with-freetype-dir=/usr/include/freetype2 && \
49-
docker-php-ext-install gd
40+
RUN set -eux; \
41+
# Install the PHP pdo_mysql extention
42+
docker-php-ext-install pdo_mysql; \
43+
# Install the PHP pdo_pgsql extention
44+
docker-php-ext-install pdo_pgsql; \
45+
# Install the PHP gd library
46+
docker-php-ext-configure gd \
47+
--with-jpeg-dir=/usr/lib \
48+
--with-freetype-dir=/usr/include/freetype2; \
49+
docker-php-ext-install gd; \
50+
php -r 'var_dump(gd_info());'

‎Dockerfile-73

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ ENV DEBIAN_FRONTEND noninteractive
2121

2222
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2323
# "libpng-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
24-
RUN set -xe && \
25-
apt-get update && \
26-
apt-get upgrade -y && \
27-
apt-get install -y --no-install-recommends \
28-
curl \
29-
libmemcached-dev \
30-
libz-dev \
31-
libpq-dev \
32-
libjpeg-dev \
33-
libpng-dev \
34-
libfreetype6-dev \
35-
libssl-dev \
36-
libmcrypt-dev \
37-
&& rm -rf /var/lib/apt/lists/*
24+
RUN set -eux; \
25+
apt-get update; \
26+
apt-get upgrade -y; \
27+
apt-get install -y --no-install-recommends \
28+
curl \
29+
libmemcached-dev \
30+
libz-dev \
31+
libpq-dev \
32+
libjpeg-dev \
33+
libpng-dev \
34+
libfreetype6-dev \
35+
libssl-dev \
36+
libmcrypt-dev; \
37+
rm -rf /var/lib/apt/lists/*
3838

39-
40-
41-
# Install the PHP pdo_mysql extention
42-
RUN docker-php-ext-install pdo_mysql \
43-
# Install the PHP pdo_pgsql extention
44-
&& docker-php-ext-install pdo_pgsql \
45-
# Install the PHP gd library
46-
&& docker-php-ext-configure gd \
47-
--with-jpeg-dir=/usr/lib \
48-
--with-freetype-dir=/usr/include/freetype2 && \
49-
docker-php-ext-install gd
39+
RUN set -eux; \
40+
# Install the PHP pdo_mysql extention
41+
docker-php-ext-install pdo_mysql; \
42+
# Install the PHP pdo_pgsql extention
43+
docker-php-ext-install pdo_pgsql; \
44+
# Install the PHP gd library
45+
docker-php-ext-configure gd \
46+
--with-jpeg-dir=/usr/lib \
47+
--with-freetype-dir=/usr/include/freetype2; \
48+
docker-php-ext-install gd; \
49+
php -r 'var_dump(gd_info());'

‎Dockerfile-74

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ ENV DEBIAN_FRONTEND noninteractive
1919

2020
# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
2121
# "libpng-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
22-
RUN set -xe && \
23-
apt-get update && \
24-
apt-get upgrade -y && \
25-
apt-get install -y --no-install-recommends \
26-
curl \
27-
libmemcached-dev \
28-
libz-dev \
29-
libpq-dev \
30-
libjpeg-dev \
31-
libpng-dev \
32-
libfreetype6-dev \
33-
libssl-dev \
34-
libmcrypt-dev \
35-
libonig-dev \
36-
&& rm -rf /var/lib/apt/lists/*
22+
RUN set -eux; \
23+
apt-get update; \
24+
apt-get upgrade -y; \
25+
apt-get install -y --no-install-recommends \
26+
curl \
27+
libmemcached-dev \
28+
libz-dev \
29+
libpq-dev \
30+
libjpeg-dev \
31+
libpng-dev \
32+
libfreetype6-dev \
33+
libssl-dev \
34+
libmcrypt-dev \
35+
libonig-dev; \
36+
rm -rf /var/lib/apt/lists/*
3737

38-
39-
40-
# Install the PHP pdo_mysql extention
41-
RUN docker-php-ext-install pdo_mysql \
42-
# Install the PHP pdo_pgsql extention
43-
&& docker-php-ext-install pdo_pgsql \
44-
# Install the PHP gd library
45-
&& docker-php-ext-configure gd \
46-
--prefix=/usr \
47-
--with-jpeg \
48-
--with-freetype && \
49-
docker-php-ext-install gd
38+
RUN set -eux; \
39+
# Install the PHP pdo_mysql extention
40+
docker-php-ext-install pdo_mysql; \
41+
# Install the PHP pdo_pgsql extention
42+
docker-php-ext-install pdo_pgsql; \
43+
# Install the PHP gd library
44+
docker-php-ext-configure gd \
45+
--prefix=/usr \
46+
--with-jpeg \
47+
--with-freetype; \
48+
docker-php-ext-install gd; \
49+
php -r 'var_dump(gd_info());'

0 commit comments

Comments
 (0)