-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #176 from infosiftr/9.0-rc
Add 9.0, "buster" aliases, and use "drupal/recommended-project" layout
- Loading branch information
Showing
18 changed files
with
477 additions
and
81 deletions.
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements | ||
FROM php:7.4-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 8.8.8 | ||
|
||
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" | ||
|
||
# vim:set ft=dockerfile: |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements | ||
FROM php:7.4-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 8.9.2 | ||
|
||
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" | ||
|
||
# vim:set ft=dockerfile: |
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
Oops, something went wrong.