Skip to content

Commit 2fe5420

Browse files
committed
Set default timezone to UTC
1 parent ccc4751 commit 2fe5420

File tree

7 files changed

+6
-165
lines changed

7 files changed

+6
-165
lines changed

base/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ RUN rm -f /etc/nginx/sites-enabled/*
1616

1717
COPY nginx.conf.tpl /tmp/nginx.conf.tpl
1818
COPY php-fpm.conf.tpl /tmp/php-fpm.conf.tpl
19+
COPY defaults.ini /etc/php/7.0/cli/conf.d/defaults.ini
20+
COPY defaults.ini /etc/php/7.0/fpm/conf.d/defaults.ini
1921

2022
RUN mkdir -p /run/php && touch /run/php/php7.0-fpm.sock && touch /run/php/php7.0-fpm.pid
2123

base/defaults.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
date.timezone=UTC

php-all-exts/Dockerfile

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
1-
FROM ubuntu:16.04
2-
3-
MAINTAINER Maksim Kotliar <kotlyar.maksim@gmail.com>
4-
5-
RUN apt-get update && \
6-
apt-get install -y --no-install-recommends --no-install-suggests nginx php php-fpm ca-certificates gettext && \
7-
rm -rf /var/lib/apt/lists/*
8-
9-
# forward request and error logs to docker log collector
10-
RUN ln -sf /dev/stdout /var/log/nginx/access.log \
11-
&& ln -sf /dev/stderr /var/log/nginx/error.log \
12-
&& ln -sf /dev/stderr /var/log/php7.0-fpm.log
13-
14-
RUN rm -f /etc/nginx/sites-enabled/*
15-
16-
COPY nginx.conf.tpl /tmp/nginx.conf.tpl
17-
COPY php-fpm.conf.tpl /tmp/php-fpm.conf.tpl
18-
19-
RUN mkdir -p /run/php && touch /run/php/php7.0-fpm.sock && touch /run/php/php7.0-fpm.pid
20-
21-
COPY entrypoint.sh /entrypoint.sh
22-
RUN chmod 755 /entrypoint.sh
23-
24-
EXPOSE 80
25-
26-
CMD ["/entrypoint.sh"]
1+
FROM formapro/nginx-php-fpm:latest
272

283
# exts
294
RUN apt-get update && \
@@ -32,5 +7,6 @@ RUN apt-get update && \
327
php-mysql php-amqp php-mbstring php-ldap php-zip php-gd php-xdebug php-imagick && \
338
echo "extension=amqp.so" > /etc/php/7.0/cli/conf.d/10-amqp.ini && \
349
echo "extension=amqp.so" > /etc/php/7.0/fpm/conf.d/10-amqp.ini && \
35-
rm -f /etc/php/7.0/mods-available/xdebug.ini \
10+
rm -f /etc/php/7.0/cli/conf.d/*xdebug.ini && \
11+
rm -f /etc/php/7.0/fpm/conf.d/*xdebug.ini && \
3612
rm -rf /var/lib/apt/lists/*

php-all-exts/entrypoint.sh

Lines changed: 0 additions & 58 deletions
This file was deleted.

php-all-exts/nginx.conf.tpl

Lines changed: 0 additions & 55 deletions
This file was deleted.

php-all-exts/php-fpm.conf.tpl

Lines changed: 0 additions & 15 deletions
This file was deleted.

php-all-exts/xdebug.ini

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)