Skip to content

Commit 46b1dc5

Browse files
tianontianon
committed
Fix some whitespace inconsistency
1 parent 0394fa1 commit 46b1dc5

File tree

3 files changed

+75
-75
lines changed

3 files changed

+75
-75
lines changed

‎7/fpm-alpine/Dockerfile

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ FROM php:7.0-fpm-alpine
44
# install the PHP extensions we need
55
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
66
RUN apk add --no-cache \
7-
freetype \
8-
libpng \
9-
libjpeg-turbo \
10-
freetype-dev \
11-
libpng-dev \
12-
libjpeg-turbo-dev \
13-
postgresql-dev \
14-
&& docker-php-ext-configure gd \
15-
--with-freetype-dir=/usr/include/ \
16-
--with-png-dir=/usr/include/ \
17-
--with-jpeg-dir=/usr/include/ \
18-
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19-
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20-
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
7+
freetype \
8+
libpng \
9+
libjpeg-turbo \
10+
freetype-dev \
11+
libpng-dev \
12+
libjpeg-turbo-dev \
13+
postgresql-dev \
14+
&& docker-php-ext-configure gd \
15+
--with-freetype-dir=/usr/include/ \
16+
--with-png-dir=/usr/include/ \
17+
--with-jpeg-dir=/usr/include/ \
18+
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19+
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20+
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
2121

2222
# set recommended PHP.ini settings
2323
# see https://secure.php.net/manual/en/opcache.installation.php
2424
RUN { \
25-
echo 'opcache.memory_consumption=128'; \
26-
echo 'opcache.interned_strings_buffer=8'; \
27-
echo 'opcache.max_accelerated_files=4000'; \
28-
echo 'opcache.revalidate_freq=60'; \
29-
echo 'opcache.fast_shutdown=1'; \
30-
echo 'opcache.enable_cli=1'; \
31-
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
25+
echo 'opcache.memory_consumption=128'; \
26+
echo 'opcache.interned_strings_buffer=8'; \
27+
echo 'opcache.max_accelerated_files=4000'; \
28+
echo 'opcache.revalidate_freq=60'; \
29+
echo 'opcache.fast_shutdown=1'; \
30+
echo 'opcache.enable_cli=1'; \
31+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
3232

3333
WORKDIR /var/www/html
3434

@@ -37,7 +37,7 @@ ENV DRUPAL_VERSION 7.54
3737
ENV DRUPAL_MD5 3068cbe488075ae166e23ea6cd29cf0f
3838

3939
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
40-
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41-
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42-
&& rm drupal.tar.gz \
43-
&& chown -R www-data:www-data sites modules themes
40+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42+
&& rm drupal.tar.gz \
43+
&& chown -R www-data:www-data sites

‎8.2/fpm-alpine/Dockerfile

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ FROM php:7.0-fpm-alpine
44
# install the PHP extensions we need
55
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
66
RUN apk add --no-cache \
7-
freetype \
8-
libpng \
9-
libjpeg-turbo \
10-
freetype-dev \
11-
libpng-dev \
12-
libjpeg-turbo-dev \
13-
postgresql-dev \
14-
&& docker-php-ext-configure gd \
15-
--with-freetype-dir=/usr/include/ \
16-
--with-png-dir=/usr/include/ \
17-
--with-jpeg-dir=/usr/include/ \
18-
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19-
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20-
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
7+
freetype \
8+
libpng \
9+
libjpeg-turbo \
10+
freetype-dev \
11+
libpng-dev \
12+
libjpeg-turbo-dev \
13+
postgresql-dev \
14+
&& docker-php-ext-configure gd \
15+
--with-freetype-dir=/usr/include/ \
16+
--with-png-dir=/usr/include/ \
17+
--with-jpeg-dir=/usr/include/ \
18+
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19+
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20+
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
2121

2222
# set recommended PHP.ini settings
2323
# see https://secure.php.net/manual/en/opcache.installation.php
2424
RUN { \
25-
echo 'opcache.memory_consumption=128'; \
26-
echo 'opcache.interned_strings_buffer=8'; \
27-
echo 'opcache.max_accelerated_files=4000'; \
28-
echo 'opcache.revalidate_freq=60'; \
29-
echo 'opcache.fast_shutdown=1'; \
30-
echo 'opcache.enable_cli=1'; \
31-
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
25+
echo 'opcache.memory_consumption=128'; \
26+
echo 'opcache.interned_strings_buffer=8'; \
27+
echo 'opcache.max_accelerated_files=4000'; \
28+
echo 'opcache.revalidate_freq=60'; \
29+
echo 'opcache.fast_shutdown=1'; \
30+
echo 'opcache.enable_cli=1'; \
31+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
3232

3333
WORKDIR /var/www/html
3434

@@ -37,7 +37,7 @@ ENV DRUPAL_VERSION 8.2.6
3737
ENV DRUPAL_MD5 57526a827771ea8a06db1792f1602a85
3838

3939
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
40-
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41-
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42-
&& rm drupal.tar.gz \
43-
&& chown -R www-data:www-data sites modules themes
40+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42+
&& rm drupal.tar.gz \
43+
&& chown -R www-data:www-data sites modules themes

‎8.3-rc/fpm-alpine/Dockerfile

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@ FROM php:7.0-fpm-alpine
44
# install the PHP extensions we need
55
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
66
RUN apk add --no-cache \
7-
freetype \
8-
libpng \
9-
libjpeg-turbo \
10-
freetype-dev \
11-
libpng-dev \
12-
libjpeg-turbo-dev \
13-
postgresql-dev \
14-
&& docker-php-ext-configure gd \
15-
--with-freetype-dir=/usr/include/ \
16-
--with-png-dir=/usr/include/ \
17-
--with-jpeg-dir=/usr/include/ \
18-
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19-
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20-
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
7+
freetype \
8+
libpng \
9+
libjpeg-turbo \
10+
freetype-dev \
11+
libpng-dev \
12+
libjpeg-turbo-dev \
13+
postgresql-dev \
14+
&& docker-php-ext-configure gd \
15+
--with-freetype-dir=/usr/include/ \
16+
--with-png-dir=/usr/include/ \
17+
--with-jpeg-dir=/usr/include/ \
18+
&& NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
19+
&& docker-php-ext-install -j${NPROC} gd mbstring opcache pdo pdo_mysql pdo_pgsql zip \
20+
&& apk del --no-cache freetype-dev libpng-dev libjpeg-turbo-dev
2121

2222
# set recommended PHP.ini settings
2323
# see https://secure.php.net/manual/en/opcache.installation.php
2424
RUN { \
25-
echo 'opcache.memory_consumption=128'; \
26-
echo 'opcache.interned_strings_buffer=8'; \
27-
echo 'opcache.max_accelerated_files=4000'; \
28-
echo 'opcache.revalidate_freq=60'; \
29-
echo 'opcache.fast_shutdown=1'; \
30-
echo 'opcache.enable_cli=1'; \
31-
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
25+
echo 'opcache.memory_consumption=128'; \
26+
echo 'opcache.interned_strings_buffer=8'; \
27+
echo 'opcache.max_accelerated_files=4000'; \
28+
echo 'opcache.revalidate_freq=60'; \
29+
echo 'opcache.fast_shutdown=1'; \
30+
echo 'opcache.enable_cli=1'; \
31+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
3232

3333
WORKDIR /var/www/html
3434

@@ -37,7 +37,7 @@ ENV DRUPAL_VERSION 8.3.0-rc1
3737
ENV DRUPAL_MD5 0acd6c49d5626cd47077eb2650a409cb
3838

3939
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
40-
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41-
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42-
&& rm drupal.tar.gz \
43-
&& chown -R www-data:www-data sites modules themes
40+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
41+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
42+
&& rm drupal.tar.gz \
43+
&& chown -R www-data:www-data sites modules themes

0 commit comments

Comments
 (0)