-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update drupal #6211
Merged
Merged
Update drupal #6211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/drupal@a214c92: Merge pull request docker-library/drupal#154 from J0WI/opcache-cli - docker-library/drupal@f52125f: Code style and consistency - docker-library/drupal@9e6a343: Drop opcache from cli actions
Diff:diff --git a/drupal_7-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile
index 5a7f86c..3d45ad3 100644
--- a/drupal_7-fpm-alpine/Dockerfile
+++ b/drupal_7-fpm-alpine/Dockerfile
@@ -3,32 +3,39 @@ FROM php:7.2-fpm-alpine
# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
-RUN set -ex \
- && apk add --no-cache --virtual .build-deps \
+RUN set -eux; \
+ \
+ apk add --no-cache --virtual .build-deps \
coreutils \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
- && docker-php-ext-configure gd \
- --with-freetype-dir=/usr/include/ \
- --with-jpeg-dir=/usr/include/ \
- --with-png-dir=/usr/include/ \
- && docker-php-ext-install -j "$(nproc)" \
+ ; \
+ \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr/include \
+ --with-jpeg-dir=/usr/include \
+ --with-png-dir=/usr/include \
+ ; \
+ \
+ docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
- && runDeps="$( \
+ ; \
+ \
+ runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
- )" \
- && apk add --virtual .drupal-phpexts-rundeps $runDeps \
- && apk del .build-deps
+ )"; \
+ apk add --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -38,7 +45,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -47,10 +53,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile
index 399d287..6864474 100644
--- a/drupal_7-fpm/Dockerfile
+++ b/drupal_7-fpm/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.2-fpm
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile
index be08873..b6299c4 100644
--- a/drupal_7/Dockerfile
+++ b/drupal_7/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.2-apache
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 7.67
ENV DRUPAL_MD5 78b1814e55fdaf40e753fd523d059f8d
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_8.6-fpm-alpine/Dockerfile b/drupal_8.6-fpm-alpine/Dockerfile
index 6fac190..1a491fd 100644
--- a/drupal_8.6-fpm-alpine/Dockerfile
+++ b/drupal_8.6-fpm-alpine/Dockerfile
@@ -3,32 +3,39 @@ FROM php:7.3-fpm-alpine
# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
-RUN set -ex \
- && apk add --no-cache --virtual .build-deps \
+RUN set -eux; \
+ \
+ apk add --no-cache --virtual .build-deps \
coreutils \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
- && docker-php-ext-configure gd \
- --with-freetype-dir=/usr/include/ \
- --with-jpeg-dir=/usr/include/ \
- --with-png-dir=/usr/include/ \
- && docker-php-ext-install -j "$(nproc)" \
+ ; \
+ \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr/include \
+ --with-jpeg-dir=/usr/include \
+ --with-png-dir=/usr/include \
+ ; \
+ \
+ docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
- && runDeps="$( \
+ ; \
+ \
+ runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
- )" \
- && apk add --virtual .drupal-phpexts-rundeps $runDeps \
- && apk del .build-deps
+ )"; \
+ apk add --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -38,7 +45,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -47,10 +53,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.6.17
ENV DRUPAL_MD5 9018a2d11381aeb0e269ca696fed9ac5
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_8.6-fpm/Dockerfile b/drupal_8.6-fpm/Dockerfile
index b2b8124..19054ce 100644
--- a/drupal_8.6-fpm/Dockerfile
+++ b/drupal_8.6-fpm/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.3-fpm
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.6.17
ENV DRUPAL_MD5 9018a2d11381aeb0e269ca696fed9ac5
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_8.6/Dockerfile b/drupal_8.6/Dockerfile
index a8b5be1..1d953d3 100644
--- a/drupal_8.6/Dockerfile
+++ b/drupal_8.6/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.3-apache
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.6.17
ENV DRUPAL_MD5 9018a2d11381aeb0e269ca696fed9ac5
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile
index 3a0231b..4cd38d8 100644
--- a/drupal_fpm-alpine/Dockerfile
+++ b/drupal_fpm-alpine/Dockerfile
@@ -3,32 +3,39 @@ FROM php:7.3-fpm-alpine
# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
-RUN set -ex \
- && apk add --no-cache --virtual .build-deps \
+RUN set -eux; \
+ \
+ apk add --no-cache --virtual .build-deps \
coreutils \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
- && docker-php-ext-configure gd \
- --with-freetype-dir=/usr/include/ \
- --with-jpeg-dir=/usr/include/ \
- --with-png-dir=/usr/include/ \
- && docker-php-ext-install -j "$(nproc)" \
+ ; \
+ \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr/include \
+ --with-jpeg-dir=/usr/include \
+ --with-png-dir=/usr/include \
+ ; \
+ \
+ docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
- && runDeps="$( \
+ ; \
+ \
+ runDeps="$( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
| tr ',' '\n' \
| sort -u \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
- )" \
- && apk add --virtual .drupal-phpexts-rundeps $runDeps \
- && apk del .build-deps
+ )"; \
+ apk add --virtual .drupal-phpexts-rundeps $runDeps; \
+ apk del .build-deps
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -38,7 +45,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -47,10 +53,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.7.3
ENV DRUPAL_MD5 bba896a1ed2fbe4a1744d82c036fcfc4
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile
index f354c70..401c70b 100644
--- a/drupal_fpm/Dockerfile
+++ b/drupal_fpm/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.3-fpm
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.7.3
ENV DRUPAL_MD5 bba896a1ed2fbe4a1744d82c036fcfc4
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile:
diff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile
index 7f16f60..92beff2 100644
--- a/drupal_latest/Dockerfile
+++ b/drupal_latest/Dockerfile
@@ -2,7 +2,7 @@
FROM php:7.3-apache
# install the PHP extensions we need
-RUN set -ex; \
+RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
@@ -12,13 +12,19 @@ RUN set -ex; \
\
apt-get update; \
apt-get install -y --no-install-recommends \
+ libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd \
+ --with-freetype-dir=/usr \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr \
+ ; \
+ \
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
@@ -49,7 +55,6 @@ RUN { \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
- echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
WORKDIR /var/www/html
@@ -58,10 +63,11 @@ WORKDIR /var/www/html
ENV DRUPAL_VERSION 8.7.3
ENV DRUPAL_MD5 bba896a1ed2fbe4a1744d82c036fcfc4
-RUN curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
- && echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
- && tar -xz --strip-components=1 -f drupal.tar.gz \
- && rm drupal.tar.gz \
- && chown -R www-data:www-data sites modules themes
+RUN set -eux; \
+ curl -fSL "https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz; \
+ echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c -; \
+ tar -xz --strip-components=1 -f drupal.tar.gz; \
+ rm drupal.tar.gz; \
+ chown -R www-data:www-data sites modules themes
# vim:set ft=dockerfile: |
Build test of #6211; d429f5c; $ bashbrew build drupal:8.7.3-apache
Building bashbrew/cache:a93bb3b66ac8faff6640fefee59db420bc8a59dde96cc455894af6cb3728a248 (drupal:8.7.3-apache)
Tagging drupal:8.7.3-apache
Tagging drupal:8.7-apache
Tagging drupal:8-apache
Tagging drupal:apache
Tagging drupal:8.7.3
Tagging drupal:8.7
Tagging drupal:8
Tagging drupal:latest
$ test/run.sh drupal:8.7.3-apache
testing drupal:8.7.3-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.7.3-fpm
Building bashbrew/cache:6a96bcadf9f21b26f87125429597a8131772d32179b7c8168ed07c9d9043c808 (drupal:8.7.3-fpm)
Tagging drupal:8.7.3-fpm
Tagging drupal:8.7-fpm
Tagging drupal:8-fpm
Tagging drupal:fpm
$ test/run.sh drupal:8.7.3-fpm
testing drupal:8.7.3-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.7.3-fpm-alpine
Building bashbrew/cache:81ea597141fba7aae646167d90ebd6f9619060239747a4138fef7af52e2d5843 (drupal:8.7.3-fpm-alpine)
Tagging drupal:8.7.3-fpm-alpine
Tagging drupal:8.7-fpm-alpine
Tagging drupal:8-fpm-alpine
Tagging drupal:fpm-alpine
$ test/run.sh drupal:8.7.3-fpm-alpine
testing drupal:8.7.3-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.6.17-apache
Building bashbrew/cache:09990aef890781996a4f4e900b22a6f3bc7bc42779297745ac1f8259f4e973bb (drupal:8.6.17-apache)
Tagging drupal:8.6.17-apache
Tagging drupal:8.6-apache
Tagging drupal:8.6.17
Tagging drupal:8.6
$ test/run.sh drupal:8.6.17-apache
testing drupal:8.6.17-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.6.17-fpm
Building bashbrew/cache:c29dc4640dfc993314e1ddaad19cf3bf7ff00b19b487d5390fd3657b5e98f20f (drupal:8.6.17-fpm)
Tagging drupal:8.6.17-fpm
Tagging drupal:8.6-fpm
$ test/run.sh drupal:8.6.17-fpm
testing drupal:8.6.17-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:8.6.17-fpm-alpine
Building bashbrew/cache:8a172c226204bd8d721706c20577bccb35dc7728e53bd9aa348ce09092ccb1bc (drupal:8.6.17-fpm-alpine)
Tagging drupal:8.6.17-fpm-alpine
Tagging drupal:8.6-fpm-alpine
$ test/run.sh drupal:8.6.17-fpm-alpine
testing drupal:8.6.17-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.67-apache
Building bashbrew/cache:c188aacfe9669301ac58a60327531a6ae0bdd8f3c29a66bbb2b5e25c27f422e8 (drupal:7.67-apache)
Tagging drupal:7.67-apache
Tagging drupal:7-apache
Tagging drupal:7.67
Tagging drupal:7
$ test/run.sh drupal:7.67-apache
testing drupal:7.67-apache
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.67-fpm
Building bashbrew/cache:fa453058750879ae1feee67bf5cf6a183ca562b21af60fc5595f4f5e45f9aecc (drupal:7.67-fpm)
Tagging drupal:7.67-fpm
Tagging drupal:7-fpm
$ test/run.sh drupal:7.67-fpm
testing drupal:7.67-fpm
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build drupal:7.67-fpm-alpine
Building bashbrew/cache:002b80478d41fba7cac1357bfdd1ca8d2dec346f3f30b1cf8d3199e4b5018acf (drupal:7.67-fpm-alpine)
Tagging drupal:7.67-fpm-alpine
Tagging drupal:7-fpm-alpine
$ test/run.sh drupal:7.67-fpm-alpine
testing drupal:7.67-fpm-alpine
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: