Skip to content

Commit 8dcef1b

Browse files
committed
upgrade version php 7.0 to 7.1 and TZ fix
1 parent f7c499d commit 8dcef1b

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

docker-compose.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,24 @@ services:
6161
image: schickling/mailcatcher
6262
restart: always
6363

64+
65+
php7console:
66+
env_file: .env
67+
build:
68+
args:
69+
- TZ=${TZ}
70+
context: ./php7console
71+
container_name: php7console
72+
image: maxlab/php7console
73+
restart: always
74+
volumes_from:
75+
- php7xdebug
76+
tty: true
77+
6478

6579
php7xdebug:
6680
env_file: .env
67-
build:
81+
build:
6882
context: ./php7xdebug
6983
image: maxlab/php7xdebug
7084
restart: always
@@ -99,18 +113,7 @@ services:
99113
- 81:80
100114
- 444:443
101115

102-
103-
php7console:
104-
build: php7console
105-
container_name: php7console
106-
image: maxlab/php7console
107-
env_file: .env
108-
restart: always
109-
volumes_from:
110-
- php7xdebug
111-
tty: true
112-
113-
116+
114117
elasticsearch:
115118
build: elasticsearch
116119
volumes:

php7console/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM php:7.0-fpm
1+
FROM php:7.1-fpm
22
MAINTAINER Stepanov Nikolai <nstepanovdev@gmail.com>
33

44
ENV COMPOSER_HOME=/home/composer/.composer
55
ENV COMPOSER_ALLOW_SUPERUSER=1
66
ENV ZSH=/home/.oh-my-zsh
7+
ARG TZ
78
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
89

910
RUN apt-get update

php7xdebug/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.0-fpm
1+
FROM php:7.1-fpm
22
MAINTAINER Stepanov Nikolai <nstepanovdev@gmail.com>
33
RUN apt-get update
44

0 commit comments

Comments
 (0)