Skip to content

Commit decb8ac

Browse files
tianontianon
authored
Merge pull request #184 from infosiftr/add-9.1
Add 9.1 release
2 parents de2626e + c9f287f commit decb8ac

File tree

21 files changed

+244
-20
lines changed

21 files changed

+244
-20
lines changed

‎7/apache-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-apache-buster
33

44
# install the PHP extensions we need

‎7/fpm-alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-alpine3.12
33

44
# install the PHP extensions we need

‎7/fpm-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-buster
33

44
# install the PHP extensions we need

‎8.8/apache-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-apache-buster
33

44
# install the PHP extensions we need

‎8.8/fpm-alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-alpine3.12
33

44
# install the PHP extensions we need

‎8.8/fpm-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-buster
33

44
# install the PHP extensions we need

‎8.9/apache-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-apache-buster
33

44
# install the PHP extensions we need

‎8.9/fpm-alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-alpine3.12
33

44
# install the PHP extensions we need

‎8.9/fpm-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-buster
33

44
# install the PHP extensions we need

‎9.0/apache-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-apache-buster
33

44
# install the PHP extensions we need

‎9.0/fpm-alpine3.12/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-alpine3.12
33

44
# install the PHP extensions we need

‎9.0/fpm-buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:7.4-fpm-buster
33

44
# install the PHP extensions we need

‎9.1/apache-buster/Dockerfile

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
2+
FROM php:8.0-apache-buster
3+
4+
# install the PHP extensions we need
5+
RUN set -eux; \
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+
libfreetype6-dev \
16+
libjpeg-dev \
17+
libpng-dev \
18+
libpq-dev \
19+
libzip-dev \
20+
; \
21+
\
22+
docker-php-ext-configure gd \
23+
--with-freetype \
24+
--with-jpeg=/usr \
25+
; \
26+
\
27+
docker-php-ext-install -j "$(nproc)" \
28+
gd \
29+
opcache \
30+
pdo_mysql \
31+
pdo_pgsql \
32+
zip \
33+
; \
34+
\
35+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
36+
apt-mark auto '.*' > /dev/null; \
37+
apt-mark manual $savedAptMark; \
38+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
39+
| awk '/=>/ { print $3 }' \
40+
| sort -u \
41+
| xargs -r dpkg-query -S \
42+
| cut -d: -f1 \
43+
| sort -u \
44+
| xargs -rt apt-mark manual; \
45+
\
46+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
47+
rm -rf /var/lib/apt/lists/*
48+
49+
# set recommended PHP.ini settings
50+
# see https://secure.php.net/manual/en/opcache.installation.php
51+
RUN { \
52+
echo 'opcache.memory_consumption=128'; \
53+
echo 'opcache.interned_strings_buffer=8'; \
54+
echo 'opcache.max_accelerated_files=4000'; \
55+
echo 'opcache.revalidate_freq=60'; \
56+
echo 'opcache.fast_shutdown=1'; \
57+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
58+
59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
62+
# https://www.drupal.org/node/3060/release
63+
ENV DRUPAL_VERSION 9.1.0
64+
65+
WORKDIR /opt/drupal
66+
RUN set -eux; \
67+
export COMPOSER_HOME="$(mktemp -d)"; \
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
70+
rmdir /var/www/html; \
71+
ln -sf /opt/drupal/web /var/www/html; \
72+
# delete composer cache
73+
rm -rf "$COMPOSER_HOME"
74+
75+
ENV PATH=${PATH}:/opt/drupal/vendor/bin
76+
77+
# vim:set ft=dockerfile:

‎9.1/fpm-alpine3.12/Dockerfile

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
2+
FROM php:8.0-fpm-alpine3.12
3+
4+
# install the PHP extensions we need
5+
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
6+
RUN set -eux; \
7+
\
8+
apk add --no-cache --virtual .build-deps \
9+
coreutils \
10+
freetype-dev \
11+
libjpeg-turbo-dev \
12+
libpng-dev \
13+
libzip-dev \
14+
postgresql-dev \
15+
; \
16+
\
17+
docker-php-ext-configure gd \
18+
--with-freetype \
19+
--with-jpeg=/usr/include \
20+
; \
21+
\
22+
docker-php-ext-install -j "$(nproc)" \
23+
gd \
24+
opcache \
25+
pdo_mysql \
26+
pdo_pgsql \
27+
zip \
28+
; \
29+
\
30+
runDeps="$( \
31+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
32+
| tr ',' '\n' \
33+
| sort -u \
34+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
35+
)"; \
36+
apk add --virtual .drupal-phpexts-rundeps $runDeps; \
37+
apk del .build-deps
38+
39+
# set recommended PHP.ini settings
40+
# see https://secure.php.net/manual/en/opcache.installation.php
41+
RUN { \
42+
echo 'opcache.memory_consumption=128'; \
43+
echo 'opcache.interned_strings_buffer=8'; \
44+
echo 'opcache.max_accelerated_files=4000'; \
45+
echo 'opcache.revalidate_freq=60'; \
46+
echo 'opcache.fast_shutdown=1'; \
47+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
48+
49+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
50+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
51+
52+
# https://www.drupal.org/node/3060/release
53+
ENV DRUPAL_VERSION 9.1.0
54+
55+
WORKDIR /opt/drupal
56+
RUN set -eux; \
57+
export COMPOSER_HOME="$(mktemp -d)"; \
58+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
59+
chown -R www-data:www-data web/sites web/modules web/themes; \
60+
rmdir /var/www/html; \
61+
ln -sf /opt/drupal/web /var/www/html; \
62+
# delete composer cache
63+
rm -rf "$COMPOSER_HOME"
64+
65+
ENV PATH=${PATH}:/opt/drupal/vendor/bin
66+
67+
# vim:set ft=dockerfile:

‎9.1/fpm-buster/Dockerfile

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
2+
FROM php:8.0-fpm-buster
3+
4+
# install the PHP extensions we need
5+
RUN set -eux; \
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+
libfreetype6-dev \
16+
libjpeg-dev \
17+
libpng-dev \
18+
libpq-dev \
19+
libzip-dev \
20+
; \
21+
\
22+
docker-php-ext-configure gd \
23+
--with-freetype \
24+
--with-jpeg=/usr \
25+
; \
26+
\
27+
docker-php-ext-install -j "$(nproc)" \
28+
gd \
29+
opcache \
30+
pdo_mysql \
31+
pdo_pgsql \
32+
zip \
33+
; \
34+
\
35+
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
36+
apt-mark auto '.*' > /dev/null; \
37+
apt-mark manual $savedAptMark; \
38+
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
39+
| awk '/=>/ { print $3 }' \
40+
| sort -u \
41+
| xargs -r dpkg-query -S \
42+
| cut -d: -f1 \
43+
| sort -u \
44+
| xargs -rt apt-mark manual; \
45+
\
46+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
47+
rm -rf /var/lib/apt/lists/*
48+
49+
# set recommended PHP.ini settings
50+
# see https://secure.php.net/manual/en/opcache.installation.php
51+
RUN { \
52+
echo 'opcache.memory_consumption=128'; \
53+
echo 'opcache.interned_strings_buffer=8'; \
54+
echo 'opcache.max_accelerated_files=4000'; \
55+
echo 'opcache.revalidate_freq=60'; \
56+
echo 'opcache.fast_shutdown=1'; \
57+
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
58+
59+
# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
60+
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/
61+
62+
# https://www.drupal.org/node/3060/release
63+
ENV DRUPAL_VERSION 9.1.0
64+
65+
WORKDIR /opt/drupal
66+
RUN set -eux; \
67+
export COMPOSER_HOME="$(mktemp -d)"; \
68+
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
69+
chown -R www-data:www-data web/sites web/modules web/themes; \
70+
rmdir /var/www/html; \
71+
ln -sf /opt/drupal/web /var/www/html; \
72+
# delete composer cache
73+
rm -rf "$COMPOSER_HOME"
74+
75+
ENV PATH=${PATH}:/opt/drupal/vendor/bin
76+
77+
# vim:set ft=dockerfile:

‎Dockerfile-7-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:%%PHP_VERSION%%
33

44
# install the PHP extensions we need

‎Dockerfile-7-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:%%PHP_VERSION%%
33

44
# install the PHP extensions we need

‎Dockerfile-alpine.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:%%PHP_VERSION%%
33

44
# install the PHP extensions we need

‎Dockerfile-debian.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
1+
# from https://www.drupal.org/docs/system-requirements/php-requirements
22
FROM php:%%PHP_VERSION%%
33

44
# install the PHP extensions we need

‎generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -Eeuo pipefail
33

44
declare -A aliases=(
55
[8.9]='8'
6-
[9.0]='9 latest'
7-
[9.1-rc]='rc'
6+
[9.1]='9 latest'
7+
[9.2-rc]='rc'
88
)
99

1010
defaultDebianSuite='buster'

‎update.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ fi
1010
versions=( "${versions[@]%/}" )
1111

1212
# https://www.drupal.org/docs/8/system-requirements/php-requirements#php_required
13-
defaultPhpVersion='7.4'
13+
defaultPhpVersion='8.0'
1414
declare -A phpVersions=(
1515
# https://www.drupal.org/docs/7/system-requirements/php-requirements#php_required
16-
#[7]='7.2'
16+
[7]='7.4'
17+
[8.8]='7.4'
18+
[8.9]='7.4'
19+
[9.0]='7.4'
1720
)
1821

1922
for version in "${versions[@]}"; do

0 commit comments

Comments
 (0)