summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramtypaldos <amtypaldos@gmail.com>2018-01-25 18:34:55 -0500
committeramtypaldos <amtypaldos@gmail.com>2018-01-25 18:34:55 -0500
commit9221f58e1b920b51a04fb197711c69e1a59d6a62 (patch)
treede6e5bb150bfcaf49f2237d1d371edeaabe4d3da
parentc0714e2382a1bb044d81bd0c8d32978c52268d15 (diff)
fix for JS error, add timezone and touch default logfile
-rw-r--r--Dockerfile17
-rw-r--r--php.ini1
2 files changed, 9 insertions, 9 deletions
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 <gmazoyer@gravitons.in>
-# 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