Adjust prod Docker

This commit is contained in:
cytopia
2018-02-27 23:38:09 +01:00
parent f5491d91fc
commit 6d35b06c45
33 changed files with 914 additions and 470 deletions

View File

@@ -14,9 +14,10 @@ set -o pipefail
###
set_timezone() {
local env_varname="${1}"
local php_conf_dir="${2}"
local php_ini_dir="${2}"
local debug="${3}"
local timezone=
local php_ini_file="${php_ini_dir}/devilbox-runtime-timezone.ini"
if ! env_set "${env_varname}"; then
log "info" "\$${env_varname} not set." "${debug}"
@@ -25,7 +26,7 @@ set_timezone() {
run "ln -sf /usr/share/zoneinfo/UTC /etc/localtime" "${debug}"
# PHP Time
log "info" "Setting PHP: timezone=UTC" "${debug}"
run "echo 'date.timezone = UTC' > ${php_conf_dir}/devilbox-runtime.ini" "${debug}"
run "echo 'date.timezone = UTC' > ${php_ini_file}" "${debug}"
else
timezone="$( env_get "${env_varname}" )"
if [ -f "/usr/share/zoneinfo/${timezone}" ]; then
@@ -34,7 +35,7 @@ set_timezone() {
run "ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime" "${debug}"
# PHP Time
log "info" "Setting PHP: timezone=${timezone}" "${debug}"
run "echo 'date.timezone = ${timezone}' > ${php_conf_dir}/devilbox-runtime.ini" "${debug}"
run "echo 'date.timezone = ${timezone}' > ${php_ini_file}" "${debug}"
else
log "err" "Invalid timezone for \$${env_varname}." "${debug}"
log "err" "Timezone '${timezone}' does not exist." "${debug}"