Skip to content

Remove 8.3 branch, and add 8.5 branch with PHP 7.2 #99

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
merged 4 commits into from
Jan 20, 2018
Merged

Remove 8.3 branch, and add 8.5 branch with PHP 7.2 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54361cb
Remove 8.3 branch, and use PHP 7.2
skyred Jan 4, 2018
6721a34
fixed libpng12-dev depedency name.
skyred Jan 4, 2018
b708e66
Added 8.5 branch
skyred Jan 19, 2018
9bba400
Point the latest back to the stable.
skyred Jan 20, 2018
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.5 VARIANT=apache
- VERSION=8.5 VARIANT=fpm
- VERSION=8.5 VARIANT=fpm-alpine
- VERSION=8.4 VARIANT=apache
- VERSION=8.4 VARIANT=fpm
- VERSION=8.4 VARIANT=fpm-alpine
- VERSION=8.3 VARIANT=apache
- VERSION=8.3 VARIANT=fpm
- VERSION=8.3 VARIANT=fpm-alpine
- VERSION=7 VARIANT=apache
- VERSION=7 VARIANT=fpm
- VERSION=7 VARIANT=fpm-alpine
Expand Down
2 changes: 1 addition & 1 deletion 8.4/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN a2enmod rewrite
RUN set -ex \
&& buildDeps=' \
libjpeg62-turbo-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
' \
&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
Expand Down
2 changes: 1 addition & 1 deletion 8.4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM php:7.1-fpm
RUN set -ex \
&& buildDeps=' \
libjpeg62-turbo-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
' \
&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
Expand Down
8 changes: 4 additions & 4 deletions 8.3/apache/Dockerfile → 8.5/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# from https://www.drupal.org/requirements/php#drupalversions
FROM php:7.1-apache
FROM php:7.2-apache

RUN a2enmod rewrite

# install the PHP extensions we need
RUN set -ex \
&& buildDeps=' \
libjpeg62-turbo-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
' \
&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
Expand Down Expand Up @@ -36,8 +36,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.3.7
ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
ENV DRUPAL_VERSION 8.5.0-alpha1
ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7

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
6 changes: 3 additions & 3 deletions 8.3/fpm-alpine/Dockerfile → 8.5/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/requirements/php#drupalversions
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 Down Expand Up @@ -38,8 +38,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.3.7
ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
ENV DRUPAL_VERSION 8.5.0-alpha1
ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7

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
8 changes: 4 additions & 4 deletions 8.3/fpm/Dockerfile → 8.5/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# from https://www.drupal.org/requirements/php#drupalversions
FROM php:7.1-fpm
FROM php:7.2-fpm

# install the PHP extensions we need
RUN set -ex \
&& buildDeps=' \
libjpeg62-turbo-dev \
libpng12-dev \
libpng-dev \
libpq-dev \
' \
&& apt-get update && apt-get install -y --no-install-recommends $buildDeps && rm -rf /var/lib/apt/lists/* \
Expand Down Expand Up @@ -34,8 +34,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.3.7
ENV DRUPAL_MD5 e7b1f382d6bd2b18d4b4aca01d335bc0
ENV DRUPAL_VERSION 8.5.0-alpha1
ENV DRUPAL_MD5 415dda1360f95c376870d2a3786483c7

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