Merge pull request #63 from drupal-docker/deprecate/54-and-55

Deprecate php 5.4 and 5.5
drupal-docker · Dec 15, 2016 · 2bd3bd9 · 2bd3bd9
2 parents 8184d81 + 1b75ff3
commit 2bd3bd9
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 135 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,6 @@ services:
 
 env:
   matrix:
-    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.4"
-    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.4"
-    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.4"
-    - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.5"
-    - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.5"
-    - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.5"
     - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6"
     - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.6"
     - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6"

diff --git a/5.4/Dockerfile-apache b/5.4/Dockerfile-apache
diff --git a/5.4/Dockerfile-cli b/5.4/Dockerfile-cli
diff --git a/5.4/Dockerfile-fpm b/5.4/Dockerfile-fpm
diff --git a/5.4/cli/drupal-cli.ini b/5.4/cli/drupal-cli.ini
diff --git a/5.4/drupal-00.ini b/5.4/drupal-00.ini
diff --git a/5.5/Dockerfile-apache b/5.5/Dockerfile-apache
diff --git a/5.5/Dockerfile-cli b/5.5/Dockerfile-cli
diff --git a/5.5/Dockerfile-fpm b/5.5/Dockerfile-fpm
diff --git a/5.5/cli/drupal-cli.ini b/5.5/cli/drupal-cli.ini
diff --git a/5.5/drupal-00.ini b/5.5/drupal-00.ini
diff --git a/5.5/drupal-opcache.ini b/5.5/drupal-opcache.ini
diff --git a/README.md b/README.md
@@ -5,12 +5,6 @@ PHP
 
 Version | Type | Tags | Dockerfile
 --- | --- | --- | ---
-5.4 (deprecated) | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-cli)
- | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-apache)
- | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-fpm)
-5.5 (deprecated) | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-cli)
- | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-apache)
- | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-fpm)
 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-cli)
  |  | `5.6-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-alpine-cli)
  | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-apache)
@@ -26,5 +20,3 @@ Version | Type | Tags | Dockerfile
  | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-apache)
  | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-fpm)
  |  | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-alpine-fpm)
-
-**Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016**