Skip to content

Add 9.1 release #184

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.

Sign up for GitHub

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

Merged
tianon merged 1 commit into from
Dec 4, 2020
Merged

Add 9.1 release #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 7/apache-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 7/fpm-alpine3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 7/fpm-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.8/apache-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.8/fpm-alpine3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.8/fpm-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.9/apache-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.9/fpm-alpine3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 8.9/fpm-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 9.0/apache-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-apache-buster

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 9.0/fpm-alpine3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-alpine3.12

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion 9.0/fpm-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:7.4-fpm-buster

# install the PHP extensions we need
Expand Down
77 changes: 77 additions & 0 deletions 9.1/apache-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-apache-buster

# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
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-freetype \
--with-jpeg=/usr \
; \
\
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini

# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 9.1.0

WORKDIR /opt/drupal
RUN set -eux; \
export COMPOSER_HOME="$(mktemp -d)"; \
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
chown -R www-data:www-data web/sites web/modules web/themes; \
rmdir /var/www/html; \
ln -sf /opt/drupal/web /var/www/html; \
# delete composer cache
rm -rf "$COMPOSER_HOME"

ENV PATH=${PATH}:/opt/drupal/vendor/bin

# vim:set ft=dockerfile:
67 changes: 67 additions & 0 deletions 9.1/fpm-alpine3.12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-fpm-alpine3.12

# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
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 \
--with-jpeg=/usr/include \
; \
\
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
; \
\
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

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini

# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 9.1.0

WORKDIR /opt/drupal
RUN set -eux; \
export COMPOSER_HOME="$(mktemp -d)"; \
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
chown -R www-data:www-data web/sites web/modules web/themes; \
rmdir /var/www/html; \
ln -sf /opt/drupal/web /var/www/html; \
# delete composer cache
rm -rf "$COMPOSER_HOME"

ENV PATH=${PATH}:/opt/drupal/vendor/bin

# vim:set ft=dockerfile:
77 changes: 77 additions & 0 deletions 9.1/fpm-buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:8.0-fpm-buster

# install the PHP extensions we need
RUN set -eux; \
\
if command -v a2enmod; then \
a2enmod rewrite; \
fi; \
\
savedAptMark="$(apt-mark showmanual)"; \
\
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-freetype \
--with-jpeg=/usr \
; \
\
docker-php-ext-install -j "$(nproc)" \
gd \
opcache \
pdo_mysql \
pdo_pgsql \
zip \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark; \
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
| awk '/=>/ { print $3 }' \
| sort -u \
| xargs -r dpkg-query -S \
| cut -d: -f1 \
| sort -u \
| xargs -rt apt-mark manual; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*

# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=60'; \
echo 'opcache.fast_shutdown=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini

# https://github.com/drupal/drupal/blob/9.0.1/composer.lock#L4052-L4053
COPY --from=composer:1.10 /usr/bin/composer /usr/local/bin/

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 9.1.0

WORKDIR /opt/drupal
RUN set -eux; \
export COMPOSER_HOME="$(mktemp -d)"; \
composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \
chown -R www-data:www-data web/sites web/modules web/themes; \
rmdir /var/www/html; \
ln -sf /opt/drupal/web /var/www/html; \
# delete composer cache
rm -rf "$COMPOSER_HOME"

ENV PATH=${PATH}:/opt/drupal/vendor/bin

# vim:set ft=dockerfile:
2 changes: 1 addition & 1 deletion Dockerfile-7-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:%%PHP_VERSION%%

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-7-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:%%PHP_VERSION%%

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:%%PHP_VERSION%%

# install the PHP extensions we need
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
# from https://www.drupal.org/docs/system-requirements/php-requirements
FROM php:%%PHP_VERSION%%

# install the PHP extensions we need
Expand Down
4 changes: 2 additions & 2 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ set -Eeuo pipefail

declare -A aliases=(
[8.9]='8'
[9.0]='9 latest'
[9.1-rc]='rc'
[9.1]='9 latest'
[9.2-rc]='rc'
)

defaultDebianSuite='buster'
Expand Down
7 changes: 5 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ fi
versions=( "${versions[@]%/}" )

# https://www.drupal.org/docs/8/system-requirements/php-requirements#php_required
defaultPhpVersion='7.4'
defaultPhpVersion='8.0'
declare -A phpVersions=(
# https://www.drupal.org/docs/7/system-requirements/php-requirements#php_required
#[7]='7.2'
[7]='7.4'
[8.8]='7.4'
[8.9]='7.4'
[9.0]='7.4'
)

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