Skip to content
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

Added 8.6-rc, removed 8.4 and 8.3 #126

Merged
merged 1 commit into from
Jul 23, 2018
Merged

Added 8.6-rc, removed 8.4 and 8.3 #126

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

env:
- VERSION=8.6-rc VARIANT=apache
- VERSION=8.6-rc VARIANT=fpm
- VERSION=8.6-rc VARIANT=fpm-alpine
- 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
55 changes: 0 additions & 55 deletions 8.3/fpm-alpine/Dockerfile
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions 8.3/fpm/Dockerfile
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions 8.4/apache/Dockerfile
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions 8.4/fpm/Dockerfile → 8.6-rc/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-fpm
FROM php:7.2-apache

# install the PHP extensions we need
RUN set -ex; \
Expand Down Expand Up @@ -54,8 +54,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.4.8
ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1
ENV DRUPAL_VERSION 8.6.0-alpha1
ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef

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.4/fpm-alpine/Dockerfile → 8.6-rc/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 Down Expand Up @@ -43,8 +43,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.4.8
ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1
ENV DRUPAL_VERSION 8.6.0-alpha1
ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef

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/apache/Dockerfile → 8.6-rc/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-apache
FROM php:7.2-fpm

# install the PHP extensions we need
RUN set -ex; \
Expand Down Expand Up @@ -54,8 +54,8 @@ RUN { \
WORKDIR /var/www/html

# https://www.drupal.org/node/3060/release
ENV DRUPAL_VERSION 8.3.9
ENV DRUPAL_MD5 b53f505b0243d608b6a6550ae664bc75
ENV DRUPAL_VERSION 8.6.0-alpha1
ENV DRUPAL_MD5 15cda0cacdf2287dfa44649d3fc590ef

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
2 changes: 0 additions & 2 deletions update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ versions=( "${versions[@]%/}" )
defaultPhpVersion='7.2'
declare -A phpVersions=(
[7]='7.0'
[8.3]='7.1'
[8.4]='7.1'
)

curl -fsSL 'https://www.drupal.org/node/3060/release' -o release
Expand Down