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

upgrade base images for php-fpm and workspace.

These duplicated Dockerfiles will be merged onto single Dockerfile
later. The same Dockerfile will check for the PHP version variable
and install the necessary softwar's accordingly.
Mahmoud Zalt 8 жил өмнө
parent
commit
4ce1d7f64a

+ 9 - 10
env-example

@@ -1,17 +1,16 @@
-### Application
-# Point to your application code, wish should be available at `/var/www`
+### Paths
+# Application: Point to your application code, will be available at `/var/www`.
 APPLICATION=../
 
-### Save Data Path (mysql redis mongo...)
+# Data: For all storage systems
 DATA_SAVE_PATH=../data
 
-### PHP version (Does not apply for HHVM)
-# PHP_VERSION=56
+### PHP version (Does not apply to HHVM)
+# Accepted values: 71 - 70 - 56.
 PHP_VERSION=70
-# PHP_VERSION=71
 
 ### PHP interpreter
-# PHP_INTERPRETER=hhvm
+# Accepted values: hhvm - php-fpm
 PHP_INTERPRETER=php-fpm
 
 ### WORKSPACE Container
@@ -135,6 +134,9 @@ SELENIUM_PORT=4444
 ### MINIO Container
 MINIO_PORT=9000
 
+### ADMINER Container
+ADM_PORT=88
+
 ### PHP MY ADMIN Container
 # PMA_DB_ENGINE=mariadb
 PMA_DB_ENGINE=mysql
@@ -143,9 +145,6 @@ PMA_PASSWORD=secret
 PMA_ROOT_PASSWORD=secret
 PMA_PORT=88
 
-### ADMINER Container
-ADM_PORT=88
-
 ### VARNISH Container
 VARNISH_CONFIG=/etc/varnish/default.vcl
 VARNISH_PORT=8080

+ 1 - 1
php-fpm/Dockerfile-56

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #
 
-FROM laradock/php-fpm:5.6--1.4
+FROM laradock/php-fpm:1.4-v5.6
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

+ 1 - 1
php-fpm/Dockerfile-70

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #
 
-FROM laradock/php-fpm:7.0--1.4
+FROM laradock/php-fpm:1.4-v7.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

+ 1 - 1
php-fpm/Dockerfile-71

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/php-fpm/tags/
 #
 
-FROM laradock/php-fpm:7.1--1.4
+FROM laradock/php-fpm:1.4-v7.1
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

+ 1 - 1
workspace/Dockerfile-56

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #
 
-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

+ 1 - 1
workspace/Dockerfile-70

@@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #
 
-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 

+ 1 - 1
workspace/Dockerfile-71

@@ -11,7 +11,7 @@
 #
 
 # placeholder. Need change after new image would be built.
-FROM laradock/workspace:1.3
+FROM laradock/workspace:1.6
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>