From fb61229bf3f3a1053fdea7d09427898d49c35fd2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 3 Sep 2018 08:40:22 +0200 Subject: [PATCH] Update the .env files and the Dockerfile. --- .env.docker | 2 +- .env.example | 2 +- Dockerfile | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.env.docker b/.env.docker index d88c6915a7..381c961798 100644 --- a/.env.docker +++ b/.env.docker @@ -15,7 +15,7 @@ APP_KEY=${FF_APP_KEY} # Change this value to your preferred time zone. # Example: Europe/Amsterdam -TZ=UTC +TZ=${TZ} # This variable must match your installation's external address but keep in mind that # it's only used on the command line as a fallback value. diff --git a/.env.example b/.env.example index 571115cda6..b8c33e380e 100644 --- a/.env.example +++ b/.env.example @@ -15,7 +15,7 @@ APP_KEY=SomeRandomStringOf32CharsExactly # Change this value to your preferred time zone. # Example: Europe/Amsterdam -TZ=${TZ} +TZ=Europe/Amsterdam # This variable must match your installation's external address but keep in mind that # it's only used on the command line as a fallback value. diff --git a/Dockerfile b/Dockerfile index 15dcc12043..e6a9ebf119 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,6 +60,10 @@ RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/00-curl.conf && ldconfig COPY .deploy/docker/supervisord.conf /etc/supervisor/supervisord.conf RUN mkdir -p /etc/supervisor/conf.d /var/log/supervisor +# Fix the link to curl: +RUN rm -rf /usr/local/lib/libcurl.so.4 && ln -s /usr/lib/x86_64-linux-gnu/libcurl.so.4.4.0 /usr/local/lib/libcurl.so.4 + + # copy Firefly III supervisor conf file. COPY ./.deploy/docker/firefly-iii.conf /etc/supervisor/conf.d/firefly-iii.conf