#136: Point to php 5.4 docker hub images.

lando · Jul 10, 2017 · 3c93541 · 3c93541
1 parent 08766bb
commit 3c93541
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 184 deletions.
diff --git a/docs/services/php.md b/docs/services/php.md
@@ -10,6 +10,7 @@ Supported versions
 *   7.0
 *   5.6
 *   5.5
+*   5.4
 *   5.3
 *   latest
 *   custom

diff --git a/plugins/lando-services/php/5.4-apache/Dockerfile b/plugins/lando-services/php/5.4-apache/Dockerfile
@@ -1,12 +1,8 @@
 # Basic apache php 5.4 appserver for Lando
 #
-# docker build -t zajca/apache-php5.4 .
+# docker build -t kalabox/php:5.4-apache .
 
-#FROM eugeneware/php-5.4:master
-FROM zajca/apache-php5.4:master
-
-# Copy our helpers
-COPY docker-php-ext-enable /usr/local/bin/
+FROM php:5.4-apache
 
 # Install dependencies we need
 RUN apt-get update && apt-get install -y \

diff --git a/plugins/lando-services/php/5.4-apache/README.md b/plugins/lando-services/php/5.4-apache/README.md
@@ -8,10 +8,7 @@ A decent cross purpose apache based php 5.4 appserver.
 #
 # docker build -t kalabox/php:5.4-apache .
 
-FROM eugeneware/php-5.4:master
-
-# Copy our helpers
-COPY docker-php-ext-enable /usr/local/bin/
+FROM php:5.4-apache
 
 # Install dependencies we need
 RUN apt-get update && apt-get install -y \

diff --git a/plugins/lando-services/php/5.4-apache/docker-php-ext-enable b/plugins/lando-services/php/5.4-apache/docker-php-ext-enable
diff --git a/plugins/lando-services/php/5.4-fpm/Dockerfile b/plugins/lando-services/php/5.4-fpm/Dockerfile
@@ -2,10 +2,7 @@
 #
 # docker build -t kalabox/php:5.4-fpm .
 
-FROM helder/php-5.4
-
-# Copy our helpers
-COPY docker-php-ext-* /usr/local/bin/
+FROM php:5.4-fpm
 
 # Install dependencies we need
 RUN apt-get update && apt-get install -y \

diff --git a/plugins/lando-services/php/5.4-fpm/README.md b/plugins/lando-services/php/5.4-fpm/README.md
@@ -8,10 +8,7 @@ A decent cross purpose fpm based php 5.4 appserver.
 #
 # docker build -t kalabox/php:5.4-fpm .
 
-FROM helder/php-5.4
-
-# Copy our helpers
-COPY docker-php-ext-* /usr/local/bin/
+FROM php:5.4-fpm
 
 # Install dependencies we need
 RUN apt-get update && apt-get install -y \

diff --git a/plugins/lando-services/php/5.4-fpm/docker-php-ext-enable b/plugins/lando-services/php/5.4-fpm/docker-php-ext-enable