Skip to content

Commit 94bc05f

Browse files
tianontianon
committed
Add back 8.3 and 8.4 for SA-CORE-2018-002
https://www.drupal.org/sa-core-2018-002 > Drupal 8.3.x and 8.4.x are no longer supported and we don't normally provide security releases for unsupported minor releases. However, given the potential severity of this issue, we are providing 8.3.x and 8.4.x releases that includes the fix for sites which have not yet had a chance to update to 8.5.0.
1 parent 597c24e commit 94bc05f

File tree

7 files changed

+380
-0
lines changed

7 files changed

+380
-0
lines changed

‎.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ env:
55
- VERSION=8.5 VARIANT=apache
66
- VERSION=8.5 VARIANT=fpm
77
- VERSION=8.5 VARIANT=fpm-alpine
8+
- VERSION=8.4 VARIANT=apache
9+
- VERSION=8.4 VARIANT=fpm
10+
- VERSION=8.4 VARIANT=fpm-alpine
11+
- VERSION=8.3 VARIANT=apache
12+
- VERSION=8.3 VARIANT=fpm
13+
- VERSION=8.3 VARIANT=fpm-alpine
814
- VERSION=7 VARIANT=apache
915
- VERSION=7 VARIANT=fpm
1016
- VERSION=7 VARIANT=fpm-alpine

‎8.3/apache/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-apache
3+
4+
# install the PHP extensions we need
5+
RUN set -ex; \
6+
\
7+
if command -v a2enmod; then \
8+
a2enmod rewrite; \
9+
fi; \
10+
\
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
\
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends \
15+
libjpeg-dev \
16+
libpng-dev \
17+
libpq-dev \
18+
; \
19+
\
20+
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
21+
docker-php-ext-install -j "$(nproc)" \
22+
gd \
23+
opcache \
24+
pdo_mysql \
25+
pdo_pgsql \
26+
zip \
27+
; \
28+
\
29+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
30+
apt-mark auto '.*' > /dev/null; \
31+
apt-mark manual $savedAptMark; \
32+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
33+
| awk '/=>/ { print $3 }' \
34+
| sort -u \
35+
| xargs -r dpkg-query -S \
36+
| cut -d: -f1 \
37+
| sort -u \
38+
| xargs -rt apt-mark manual; \
39+
\
40+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
41+
rm -rf /var/lib/apt/lists/*
42+
43+
# set recommended PHP.ini settings
44+
# see https://secure.php.net/manual/en/opcache.installation.php
45+
RUN { \
46+
echo 'opcache.memory_consumption=128'; \
47+
echo 'opcache.interned_strings_buffer=8'; \
48+
echo 'opcache.max_accelerated_files=4000'; \
49+
echo 'opcache.revalidate_freq=60'; \
50+
echo 'opcache.fast_shutdown=1'; \
51+
echo 'opcache.enable_cli=1'; \
52+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
53+
54+
WORKDIR /var/www/html
55+
56+
# https://www.drupal.org/node/3060/release
57+
ENV DRUPAL_VERSION 8.3.9
58+
ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75
59+
60+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
61+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
62+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
63+
&& rm drupal.tar.gz \
64+
&& chown -R www-data:www-data sites modules themes
65+
66+
# vim:set ft=dockerfile:

‎8.3/fpm-alpine/Dockerfile

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-fpm-alpine
3+
4+
# install the PHP extensions we need
5+
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
6+
RUN set -ex \
7+
&& apk add --no-cache --virtual .build-deps \
8+
coreutils \
9+
freetype-dev \
10+
libjpeg-turbo-dev \
11+
libpng-dev \
12+
postgresql-dev \
13+
&& docker-php-ext-configure gd \
14+
--with-freetype-dir=/usr/include/ \
15+
--with-jpeg-dir=/usr/include/ \
16+
--with-png-dir=/usr/include/ \
17+
&& docker-php-ext-install -j "$(nproc)" \
18+
gd \
19+
opcache \
20+
pdo_mysql \
21+
pdo_pgsql \
22+
zip \
23+
&& runDeps="$( \
24+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
25+
| tr ',' '\n' \
26+
| sort -u \
27+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
28+
)" \
29+
&& apk add --virtual .drupal-phpexts-rundeps $runDeps \
30+
&& apk del .build-deps
31+
32+
# set recommended PHP.ini settings
33+
# see https://secure.php.net/manual/en/opcache.installation.php
34+
RUN { \
35+
echo 'opcache.memory_consumption=128'; \
36+
echo 'opcache.interned_strings_buffer=8'; \
37+
echo 'opcache.max_accelerated_files=4000'; \
38+
echo 'opcache.revalidate_freq=60'; \
39+
echo 'opcache.fast_shutdown=1'; \
40+
echo 'opcache.enable_cli=1'; \
41+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
42+
43+
WORKDIR /var/www/html
44+
45+
# https://www.drupal.org/node/3060/release
46+
ENV DRUPAL_VERSION 8.3.9
47+
ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75
48+
49+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
50+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
51+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
52+
&& rm drupal.tar.gz \
53+
&& chown -R www-data:www-data sites modules themes
54+
55+
# vim:set ft=dockerfile:

‎8.3/fpm/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-fpm
3+
4+
# install the PHP extensions we need
5+
RUN set -ex; \
6+
\
7+
if command -v a2enmod; then \
8+
a2enmod rewrite; \
9+
fi; \
10+
\
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
\
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends \
15+
libjpeg-dev \
16+
libpng-dev \
17+
libpq-dev \
18+
; \
19+
\
20+
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
21+
docker-php-ext-install -j "$(nproc)" \
22+
gd \
23+
opcache \
24+
pdo_mysql \
25+
pdo_pgsql \
26+
zip \
27+
; \
28+
\
29+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
30+
apt-mark auto '.*' > /dev/null; \
31+
apt-mark manual $savedAptMark; \
32+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
33+
| awk '/=>/ { print $3 }' \
34+
| sort -u \
35+
| xargs -r dpkg-query -S \
36+
| cut -d: -f1 \
37+
| sort -u \
38+
| xargs -rt apt-mark manual; \
39+
\
40+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
41+
rm -rf /var/lib/apt/lists/*
42+
43+
# set recommended PHP.ini settings
44+
# see https://secure.php.net/manual/en/opcache.installation.php
45+
RUN { \
46+
echo 'opcache.memory_consumption=128'; \
47+
echo 'opcache.interned_strings_buffer=8'; \
48+
echo 'opcache.max_accelerated_files=4000'; \
49+
echo 'opcache.revalidate_freq=60'; \
50+
echo 'opcache.fast_shutdown=1'; \
51+
echo 'opcache.enable_cli=1'; \
52+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
53+
54+
WORKDIR /var/www/html
55+
56+
# https://www.drupal.org/node/3060/release
57+
ENV DRUPAL_VERSION 8.3.9
58+
ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75
59+
60+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
61+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
62+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
63+
&& rm drupal.tar.gz \
64+
&& chown -R www-data:www-data sites modules themes
65+
66+
# vim:set ft=dockerfile:

‎8.4/apache/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-apache
3+
4+
# install the PHP extensions we need
5+
RUN set -ex; \
6+
\
7+
if command -v a2enmod; then \
8+
a2enmod rewrite; \
9+
fi; \
10+
\
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
\
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends \
15+
libjpeg-dev \
16+
libpng-dev \
17+
libpq-dev \
18+
; \
19+
\
20+
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
21+
docker-php-ext-install -j "$(nproc)" \
22+
gd \
23+
opcache \
24+
pdo_mysql \
25+
pdo_pgsql \
26+
zip \
27+
; \
28+
\
29+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
30+
apt-mark auto '.*' > /dev/null; \
31+
apt-mark manual $savedAptMark; \
32+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
33+
| awk '/=>/ { print $3 }' \
34+
| sort -u \
35+
| xargs -r dpkg-query -S \
36+
| cut -d: -f1 \
37+
| sort -u \
38+
| xargs -rt apt-mark manual; \
39+
\
40+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
41+
rm -rf /var/lib/apt/lists/*
42+
43+
# set recommended PHP.ini settings
44+
# see https://secure.php.net/manual/en/opcache.installation.php
45+
RUN { \
46+
echo 'opcache.memory_consumption=128'; \
47+
echo 'opcache.interned_strings_buffer=8'; \
48+
echo 'opcache.max_accelerated_files=4000'; \
49+
echo 'opcache.revalidate_freq=60'; \
50+
echo 'opcache.fast_shutdown=1'; \
51+
echo 'opcache.enable_cli=1'; \
52+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
53+
54+
WORKDIR /var/www/html
55+
56+
# https://www.drupal.org/node/3060/release
57+
ENV DRUPAL_VERSION 8.4.6
58+
ENV DRUPAL_MD5 e4b17dc542724f6298435dca81a84f8d
59+
60+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
61+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
62+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
63+
&& rm drupal.tar.gz \
64+
&& chown -R www-data:www-data sites modules themes
65+
66+
# vim:set ft=dockerfile:

‎8.4/fpm-alpine/Dockerfile

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-fpm-alpine
3+
4+
# install the PHP extensions we need
5+
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
6+
RUN set -ex \
7+
&& apk add --no-cache --virtual .build-deps \
8+
coreutils \
9+
freetype-dev \
10+
libjpeg-turbo-dev \
11+
libpng-dev \
12+
postgresql-dev \
13+
&& docker-php-ext-configure gd \
14+
--with-freetype-dir=/usr/include/ \
15+
--with-jpeg-dir=/usr/include/ \
16+
--with-png-dir=/usr/include/ \
17+
&& docker-php-ext-install -j "$(nproc)" \
18+
gd \
19+
opcache \
20+
pdo_mysql \
21+
pdo_pgsql \
22+
zip \
23+
&& runDeps="$( \
24+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
25+
| tr ',' '\n' \
26+
| sort -u \
27+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
28+
)" \
29+
&& apk add --virtual .drupal-phpexts-rundeps $runDeps \
30+
&& apk del .build-deps
31+
32+
# set recommended PHP.ini settings
33+
# see https://secure.php.net/manual/en/opcache.installation.php
34+
RUN { \
35+
echo 'opcache.memory_consumption=128'; \
36+
echo 'opcache.interned_strings_buffer=8'; \
37+
echo 'opcache.max_accelerated_files=4000'; \
38+
echo 'opcache.revalidate_freq=60'; \
39+
echo 'opcache.fast_shutdown=1'; \
40+
echo 'opcache.enable_cli=1'; \
41+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
42+
43+
WORKDIR /var/www/html
44+
45+
# https://www.drupal.org/node/3060/release
46+
ENV DRUPAL_VERSION 8.4.6
47+
ENV DRUPAL_MD5 e4b17dc542724f6298435dca81a84f8d
48+
49+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
50+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
51+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
52+
&& rm drupal.tar.gz \
53+
&& chown -R www-data:www-data sites modules themes
54+
55+
# vim:set ft=dockerfile:

‎8.4/fpm/Dockerfile

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# from https://www.drupal.org/requirements/php#drupalversions
2+
FROM php:7.2-fpm
3+
4+
# install the PHP extensions we need
5+
RUN set -ex; \
6+
\
7+
if command -v a2enmod; then \
8+
a2enmod rewrite; \
9+
fi; \
10+
\
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
\
13+
apt-get update; \
14+
apt-get install -y --no-install-recommends \
15+
libjpeg-dev \
16+
libpng-dev \
17+
libpq-dev \
18+
; \
19+
\
20+
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
21+
docker-php-ext-install -j "$(nproc)" \
22+
gd \
23+
opcache \
24+
pdo_mysql \
25+
pdo_pgsql \
26+
zip \
27+
; \
28+
\
29+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
30+
apt-mark auto '.*' > /dev/null; \
31+
apt-mark manual $savedAptMark; \
32+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
33+
| awk '/=>/ { print $3 }' \
34+
| sort -u \
35+
| xargs -r dpkg-query -S \
36+
| cut -d: -f1 \
37+
| sort -u \
38+
| xargs -rt apt-mark manual; \
39+
\
40+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
41+
rm -rf /var/lib/apt/lists/*
42+
43+
# set recommended PHP.ini settings
44+
# see https://secure.php.net/manual/en/opcache.installation.php
45+
RUN { \
46+
echo 'opcache.memory_consumption=128'; \
47+
echo 'opcache.interned_strings_buffer=8'; \
48+
echo 'opcache.max_accelerated_files=4000'; \
49+
echo 'opcache.revalidate_freq=60'; \
50+
echo 'opcache.fast_shutdown=1'; \
51+
echo 'opcache.enable_cli=1'; \
52+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
53+
54+
WORKDIR /var/www/html
55+
56+
# https://www.drupal.org/node/3060/release
57+
ENV DRUPAL_VERSION 8.4.6
58+
ENV DRUPAL_MD5 e4b17dc542724f6298435dca81a84f8d
59+
60+
RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
61+
&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
62+
&& tar -xz --strip-components=1 -f drupal.tar.gz \
63+
&& rm drupal.tar.gz \
64+
&& chown -R www-data:www-data sites modules themes
65+
66+
# vim:set ft=dockerfile:

0 commit comments

Comments
 (0)