ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Mahmoud Zalt 2017-04-20 13:45:04 -04:00
parent a6ff3d0666
commit 4dda815980
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
env-example
View File

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

2
php-fpm/Dockerfile-56
View File

@ -10,7 +10,7 @@
# https://hub.docker.com/r/laradock/php-fpm/tags/ # 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> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

2
php-fpm/Dockerfile-70
View File

@ -10,7 +10,7 @@
# https://hub.docker.com/r/laradock/php-fpm/tags/ # 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> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

2
php-fpm/Dockerfile-71
View File

@ -10,7 +10,7 @@
# https://hub.docker.com/r/laradock/php-fpm/tags/ # 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> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

2
workspace/Dockerfile-56
View File

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

2
workspace/Dockerfile-70
View File

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

2
workspace/Dockerfile-71
View File

@ -11,7 +11,7 @@
# #
# placeholder. Need change after new image would be built. # 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> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>