From 9221f58e1b920b51a04fb197711c69e1a59d6a62 Mon Sep 17 00:00:00 2001 From: amtypaldos Date: Thu, 25 Jan 2018 18:34:55 -0500 Subject: fix for JS error, add timezone and touch default logfile --- Dockerfile | 17 ++++++++--------- php.ini | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 php.ini diff --git a/Dockerfile b/Dockerfile index fb5eb07..7b6f4e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,14 @@ FROM php:5.6-apache MAINTAINER Guillaume Mazoyer -# Need git -RUN apt-get update && apt-get install -y git - WORKDIR /var/www/html -# Clone repository with given branch -ARG BRANCH=master -ARG URL=https://github.com/respawner/looking-glass.git -RUN git clone --depth 1 $URL -b $BRANCH . +# add custom php.ini +COPY php.ini /usr/local/etc/php/ + +# copy code from local folder +COPY ./ /var/www/html + +RUN touch /var/log/looking-glass.log && chmod 777 /var/log/looking-glass.log + -# Get rid of git -RUN apt-get purge -y --auto-remove git diff --git a/php.ini b/php.ini new file mode 100644 index 0000000..ced3e0d --- /dev/null +++ b/php.ini @@ -0,0 +1 @@ +date.timezone = UTC \ No newline at end of file -- cgit v1.2.3 From f96656cf8267b18d7921a33f64235e0a2821ff74 Mon Sep 17 00:00:00 2001 From: amtypaldos Date: Fri, 26 Jan 2018 14:45:40 -0500 Subject: add timezone setting to dockerfile instead of seperate php.ini --- Dockerfile | 4 ++-- php.ini | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 php.ini diff --git a/Dockerfile b/Dockerfile index 7b6f4e3..0f9595b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ MAINTAINER Guillaume Mazoyer WORKDIR /var/www/html -# add custom php.ini -COPY php.ini /usr/local/etc/php/ +# add timezone to php.ini +RUN echo 'date.timezone = UTC' >> /usr/local/etc/php/php.ini # copy code from local folder COPY ./ /var/www/html diff --git a/php.ini b/php.ini deleted file mode 100644 index ced3e0d..0000000 --- a/php.ini +++ /dev/null @@ -1 +0,0 @@ -date.timezone = UTC \ No newline at end of file -- cgit v1.2.3