Skip to content

Commit 4dda815

Browse files
committed
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.
1 parent a6ff3d0 commit 4dda815

7 files changed

Lines changed: 15 additions & 16 deletions

File tree

env-example

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
### Application
2-
# Point to your application code, wish should be available at `/var/www`
1+
### Paths
2+
# Application: Point to your application code, will be available at `/var/www`.
33
APPLICATION=../
44

5-
### Save Data Path (mysql redis mongo...)
5+
# Data: For all storage systems
66
DATA_SAVE_PATH=../data
77

8-
### PHP version (Does not apply for HHVM)
9-
# PHP_VERSION=56
8+
### PHP version (Does not apply to HHVM)
9+
# Accepted values: 71 - 70 - 56.
1010
PHP_VERSION=70
11-
# PHP_VERSION=71
1211

1312
### PHP interpreter
14-
# PHP_INTERPRETER=hhvm
13+
# Accepted values: hhvm - php-fpm
1514
PHP_INTERPRETER=php-fpm
1615

1716
### WORKSPACE Container
@@ -125,6 +124,9 @@ SELENIUM_PORT=4444
125124
### MINIO Container
126125
MINIO_PORT=9000
127126

127+
### ADMINER Container
128+
ADM_PORT=88
129+
128130
### PHP MY ADMIN Container
129131
# PMA_DB_ENGINE=mariadb
130132
PMA_DB_ENGINE=mysql
@@ -133,9 +135,6 @@ PMA_PASSWORD=secret
133135
PMA_ROOT_PASSWORD=secret
134136
PMA_PORT=88
135137

136-
### ADMINER Container
137-
ADM_PORT=88
138-
139138
### VARNISH Container
140139
VARNISH_CONFIG=/etc/varnish/default.vcl
141140
VARNISH_PORT=8080

php-fpm/Dockerfile-56

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://hub.docker.com/r/laradock/php-fpm/tags/
1111
#
1212

13-
FROM laradock/php-fpm:5.6--1.4
13+
FROM laradock/php-fpm:1.4-v5.6
1414

1515
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1616

php-fpm/Dockerfile-70

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://hub.docker.com/r/laradock/php-fpm/tags/
1111
#
1212

13-
FROM laradock/php-fpm:7.0--1.4
13+
FROM laradock/php-fpm:1.4-v7.0
1414

1515
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1616

php-fpm/Dockerfile-71

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://hub.docker.com/r/laradock/php-fpm/tags/
1111
#
1212

13-
FROM laradock/php-fpm:7.1--1.4
13+
FROM laradock/php-fpm:1.4-v7.1
1414

1515
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1616

workspace/Dockerfile-56

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://hub.docker.com/r/laradock/workspace/tags/
1111
#
1212

13-
FROM laradock/workspace:1.3
13+
FROM laradock/workspace:1.6
1414

1515
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1616

workspace/Dockerfile-70

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://hub.docker.com/r/laradock/workspace/tags/
1111
#
1212

13-
FROM laradock/workspace:1.3
13+
FROM laradock/workspace:1.6
1414

1515
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1616

workspace/Dockerfile-71

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212

1313
# placeholder. Need change after new image would be built.
14-
FROM laradock/workspace:1.3
14+
FROM laradock/workspace:1.6
1515

1616
MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
1717

0 commit comments

Comments
 (0)