Skip to content

Add Drupal 8.7 and remove 8.5 #150

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
May 16, 2019
Merged

Add Drupal 8.7 and remove 8.5 #150

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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ language: bash
services: docker

env:
- VERSION=8.7 VARIANT=apache
- VERSION=8.7 VARIANT=fpm
- VERSION=8.7 VARIANT=fpm-alpine
- VERSION=8.6 VARIANT=apache
- VERSION=8.6 VARIANT=fpm
- VERSION=8.6 VARIANT=fpm-alpine
- VERSION=8.5 VARIANT=apache
- VERSION=8.5 VARIANT=fpm
- VERSION=8.5 VARIANT=fpm-alpine
- VERSION=7 VARIANT=apache
- VERSION=7 VARIANT=fpm
- VERSION=7 VARIANT=fpm-alpine
Expand Down
3 changes: 2 additions & 1 deletion 7/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.1-apache
FROM php:7.2-apache

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down
3 changes: 2 additions & 1 deletion 7/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.1-fpm-alpine
FROM php:7.2-fpm-alpine

# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
Expand All @@ -9,6 +9,7 @@ RUN set -ex \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
Expand Down
3 changes: 2 additions & 1 deletion 7/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.1-fpm
FROM php:7.2-fpm

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down
3 changes: 2 additions & 1 deletion 8.6/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-apache
FROM php:7.3-apache

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down
3 changes: 2 additions & 1 deletion 8.6/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-fpm-alpine
FROM php:7.3-fpm-alpine

# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
Expand All @@ -9,6 +9,7 @@ RUN set -ex \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
Expand Down
3 changes: 2 additions & 1 deletion 8.6/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-fpm
FROM php:7.3-fpm

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down
7 changes: 4 additions & 3 deletions 8.5/fpm/Dockerfile → 8.7/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-fpm
FROM php:7.3-apache

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down Expand Up @@ -54,8 +55,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.5.15
ENV DRUPAL_MD5 7a4ba499132c834e5d33bccae5ac1430
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697

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 - \
Expand Down
7 changes: 4 additions & 3 deletions 8.5/fpm-alpine/Dockerfile → 8.7/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-fpm-alpine
FROM php:7.3-fpm-alpine

# install the PHP extensions we need
# postgresql-dev is needed for https://bugs.alpinelinux.org/issues/3642
Expand All @@ -9,6 +9,7 @@ RUN set -ex \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
Expand Down Expand Up @@ -43,8 +44,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.5.15
ENV DRUPAL_MD5 7a4ba499132c834e5d33bccae5ac1430
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697

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 - \
Expand Down
7 changes: 4 additions & 3 deletions 8.5/apache/Dockerfile → 8.7/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# from https://www.drupal.org/docs/8/system-requirements/drupal-8-php-requirements
FROM php:7.2-apache
FROM php:7.3-fpm

# install the PHP extensions we need
RUN set -ex; \
Expand All @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
Expand Down Expand Up @@ -54,8 +55,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.5.15
ENV DRUPAL_MD5 7a4ba499132c834e5d33bccae5ac1430
ENV DRUPAL_VERSION 8.7.1
ENV DRUPAL_MD5 2cf2a1c93ea785c6ff91d29aebef2697

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 - \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ RUN set -ex \
freetype-dev \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
postgresql-dev \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN set -ex; \
libjpeg-dev \
libpng-dev \
libpq-dev \
libzip-dev \
; \
\
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
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 @@ -2,8 +2,8 @@
set -eu

declare -A aliases=(
[8.6]='8 latest'
[8.7-rc]='rc'
[8.7]='8 latest'
[8.8-rc]='rc'
)

self="$(basename "$BASH_SOURCE")"
Expand Down
4 changes: 2 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ if [ ${#versions[@]} -eq 0 ]; then
fi
versions=( "${versions[@]%/}" )

defaultPhpVersion='7.2'
defaultPhpVersion='7.3'
declare -A phpVersions=(
[7]='7.1'
[7]='7.2'
)

travisEnv=
Expand Down