2
0
Эх сурвалжийг харах

php 5.6 will no longer be maintained

Mark Shust 6 жил өмнө
parent
commit
0fa993ba76

+ 3 - 0
CHANGELOG.md

@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Added php ssh2 extension
 
+### Deprecated
+- The PHP 5.6 release will no longer be maintained, the last released version is 16.0.0
+
 ## [16.0.0] - 2018-08-22
 
 ### Changed

+ 2 - 3
README.md

@@ -32,9 +32,8 @@ View Dockerfiles:
       - [`7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.0)
       - [`7.0-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.0)
       - [`7.0-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.0)
-  - 5.6
-      - [`5.6-fpm`, `5.6-fpm-7`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
-      - [`5.6-fpm-6`](https://github.com/markoshust/docker-magento/tree/16.0.0/images/php/5.6)
+  - 5.6 [NO LONGER MAINTAINED]
+      - [`5.6-fpm`, `5.6-fpm-6`](https://github.com/markoshust/docker-magento/tree/16.0.0/images/php/5.6)
       - [`5.6-fpm-5`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/php/5.6)
       - [`5.6-fpm-4`](https://github.com/markoshust/docker-magento/tree/15.0.0/images/php/5.6)
       - [`5.6-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/5.6)

+ 3 - 3
compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 16.1.0
+# Version 16.0.0
 
 version: "3"
 
@@ -18,14 +18,14 @@ services:
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:5.6-fpm-7
+    image: markoshust/magento-php:5.6-fpm-6
     links:
       - db
     volumes: *appvolumes
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
-  #  image: markoshust/magento-php:5.6-fpm-7
+  #  image: markoshust/magento-php:5.6-fpm-6
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  tty: true

+ 0 - 4
images/php/5.6/Dockerfile

@@ -36,10 +36,6 @@ RUN pecl channel-update pecl.php.net \
   && docker-php-ext-enable xdebug \
   && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-RUN apt-get install -y libssh2-1-dev \
-  && pecl install ssh2-1.1.2 \
-  && docker-php-ext-enable ssh2
-
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer