ensure latest alpine 3.10 is used, add tzdata to support timezone in nginx logs

This commit is contained in:
El RIDO 2019-08-24 08:25:41 +02:00
parent ad8a4c184a
commit a4a3f175a4
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
2 changed files with 12 additions and 3 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.10.0 FROM alpine:3.10
MAINTAINER PrivateBin <support@privatebin.org> MAINTAINER PrivateBin <support@privatebin.org>
@ -6,8 +6,8 @@ ENV RELEASE 1.3
RUN \ RUN \
# Install dependencies # Install dependencies
apk add --no-cache supervisor nginx php7-fpm php7-json php7-gd php7-opcache \ apk add --no-cache supervisor tzdata nginx php7-fpm \
php7-pdo_mysql php7-pdo_pgsql \ php7-json php7-gd php7-opcache php7-pdo_mysql php7-pdo_pgsql \
# Remove (some of the) default nginx config # Remove (some of the) default nginx config
&& rm -f /etc/nginx.conf \ && rm -f /etc/nginx.conf \
&& rm -f /etc/nginx/conf.d/default.conf \ && rm -f /etc/nginx/conf.d/default.conf \

View File

@ -32,6 +32,15 @@ docker run -d --restart="always" --read-only -p 8080:80 -v conf.php:/srv/cfg/con
Note: The `Filesystem` data storage is supported out of the box. The image includes PDO modules for MySQL and SQLite, required for the `Database` one, but you still need to keep the /srv/data persisted for the server salt and the traffic limiter. Note: The `Filesystem` data storage is supported out of the box. The image includes PDO modules for MySQL and SQLite, required for the `Database` one, but you still need to keep the /srv/data persisted for the server salt and the traffic limiter.
### Timezone settings
The image supports the use of the following two environment variables to adjust the timezone. This is most useful to ensure the logs show the correct local time.
- `TZ`
- `PHP_TZ`
Note: The application internally handles expiration of pastes based on a UNIX timestamp that is calculated based on the timezone set during its creation. Changing the PHP_TZ will affect this and leads to earlier (if the timezone is increased) or later (if it is decreased) expiration then expected.
## Rolling your own image ## Rolling your own image
To reproduce the image, run: To reproduce the image, run: