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

Merge pull request #3 from laradock/master 

update
This commit is contained in:
zuohuadong 2017-04-22 13:49:39 +08:00 committed by GitHub
parent f714954033 c1a2f4b2a8
commit a657dce572
8 changed files with 1937 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env-example
View File

@ -16,7 +16,7 @@ DATA_SAVE_PATH=../data
# Applies to the Workspace and PHP-FPM containers (Does not apply to HHVM) # Applies to the Workspace and PHP-FPM containers (Does not apply to HHVM)
# Accepted values: 71 - 70 - 56 # Accepted values: 71 - 70 - 56
PHP_VERSION=70 PHP_VERSION=71
### PHP interpreter ### PHP interpreter
# Accepted values: hhvm - php-fpm # Accepted values: hhvm - php-fpm

4
php-fpm/Dockerfile-56
View File

@ -9,8 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/php-fpm/tags/ # https://hub.docker.com/r/laradock/php-fpm/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
FROM laradock/php-fpm:1.4-v5.6 FROM laradock/php-fpm:1.4-56
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

4
php-fpm/Dockerfile-70
View File

@ -9,8 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/php-fpm/tags/ # https://hub.docker.com/r/laradock/php-fpm/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
FROM laradock/php-fpm:1.4-v7.0 FROM laradock/php-fpm:1.4-70
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

4
php-fpm/Dockerfile-71
View File

@ -9,8 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/php-fpm/tags/ # https://hub.docker.com/r/laradock/php-fpm/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
FROM laradock/php-fpm:1.4-v7.1 FROM laradock/php-fpm:1.4-71
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

1918
php-fpm/php71.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4
workspace/Dockerfile-56
View File

@ -9,8 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/workspace/tags/ # https://hub.docker.com/r/laradock/workspace/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
FROM laradock/workspace:1.6 FROM laradock/workspace:1.7-56
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

4
workspace/Dockerfile-70
View File

@ -9,8 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/workspace/tags/ # https://hub.docker.com/r/laradock/workspace/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
FROM laradock/workspace:1.6 FROM laradock/workspace:1.7-70
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>

5
workspace/Dockerfile-71
View File

@ -9,9 +9,10 @@
# To change its version, see the available Tags on the Docker Hub: # To change its version, see the available Tags on the Docker Hub:
# https://hub.docker.com/r/laradock/workspace/tags/ # https://hub.docker.com/r/laradock/workspace/tags/
# #
# Note: Base Image name format {image-tag}-{php-version}
#
# placeholder. Need change after new image would be built. FROM laradock/workspace:1.7-71
FROM laradock/workspace:1.6
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me> MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>