Merge pull request Dashticz#831 from lokonli/v3.8-master

V3.8 master
sammyke007 · Apr 10, 2021 · d730d7a · d730d7a
2 parents 1b4da19 + b90775f
commit d730d7a
Show file tree

Hide file tree

Showing 140 changed files with 20,068 additions and 9,728 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+#The docker build doesn't require anything, so just ignore all
+*
+
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 Makefile.ini
 /custom/*
 /custom_2/*
+.env
diff --git a/Dockerfile b/Dockerfile
@@ -3,5 +3,7 @@
 FROM php:7.4-apache
 #Default value in case no build argument:
 ARG tz="Europe/Amsterdam" 
-RUN printf "[PHP]\ndate.timezone = $tz\n" > /usr/local/etc/php/conf.d/tzone.ini
+RUN printf "[PHP]\ndate.timezone = $tz\n" > /usr/local/etc/php/conf.d/tzone.ini && \
+mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+#RUN printf "[PHP]\ndate.timezone = $tz\n" > /usr/local/etc/php/conf.d/tzone.ini 
 SHELL ["/bin/bash", "-c"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#The docker build doesn't require anything, so just ignore all
		*