Merge pull request #487 from netlogix/bugfix/php-server-timezone

Author: Sascha Nowak

php/7.x.Dockerfile

@@ -5,8 +5,9 @@ ARG PHP_VERSION=7.4
 ARG XDEBUG_VERSION=3.1.6
 
 ENV DEBIAN_FRONTEND=noninteractive \
-    TZ=UTC \
-    LANG="C.UTF-8"
+    TZ="Europe/Berlin" \
+    LANG="C.UTF-8" \
+    TERM=xterm-256color
 
 ENV PHP_VERSION=${PHP_VERSION} \
     PHP_MEMORY_LIMIT=128m \
@@ -115,7 +116,8 @@ COPY config/fpm/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 COPY config/fpm-${PHP_VERSION}/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 
 # Config files
-COPY dev/bash /root/
+COPY config/bash /root/
+COPY config/bash/.bashrc /etc/bash.bashrc
 
 # Test php-fpm config and php info
 RUN php-fpm -tt
@@ -172,7 +174,6 @@ ENV PHP_ASSERT=1 \
     COMPOSER_CACHE_DIR=/.cache/composer/ \
     YARN_CACHE_FOLDER=/.cache/yarn/ \
     npm_config_cache=/.cache/npm/ \
-    TERM=xterm-256color \
     TIDEWAYS_DAEMON=""
 
 # enable debugging with PhpStorm

php/8.x.Dockerfile

@@ -6,8 +6,9 @@ ARG PHP_VERSION=8.4
 ARG XDEBUG_VERSION=3.4.1
 
 ENV DEBIAN_FRONTEND=noninteractive \
-    TZ=UTC \
-    LANG="C.UTF-8"
+    TZ="Europe/Berlin" \
+    LANG="C.UTF-8" \
+    TERM=xterm-256color
 
 ENV PHP_VERSION=${PHP_VERSION} \
     PHP_MEMORY_LIMIT=128m \
@@ -124,7 +125,8 @@ COPY config/fpm/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 COPY config/fpm-${PHP_VERSION}/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 
 # Config files
-COPY dev/bash /root/
+COPY config/bash /root/
+COPY config/bash/.bashrc /etc/bash.bashrc
 
 # Test php-fpm config and php info
 RUN php-fpm -tt
@@ -181,7 +183,6 @@ ENV PHP_ASSERT=1 \
     COMPOSER_CACHE_DIR=/.cache/composer/ \
     YARN_CACHE_FOLDER=/.cache/yarn/ \
     npm_config_cache=/.cache/npm/ \
-    TERM=xterm-256color \
     TIDEWAYS_DAEMON=""
 
 # enable debugging with PhpStorm

php/Dockerfile

@@ -6,8 +6,9 @@ ARG PHP_VERSION=8.3
 ARG XDEBUG_VERSION=3.4.1
 
 ENV DEBIAN_FRONTEND=noninteractive \
-    TZ=UTC \
-    LANG="C.UTF-8"
+    TZ="Europe/Berlin" \
+    LANG="C.UTF-8" \
+    TERM=xterm-256color
 
 ENV PHP_VERSION=${PHP_VERSION} \
     PHP_MEMORY_LIMIT=128m \
@@ -120,7 +121,8 @@ COPY config/fpm/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 COPY config/fpm-${PHP_VERSION}/pool.d /etc/php/${PHP_VERSION}/fpm/pool.d/
 
 # Config files
-COPY dev/bash /root/
+COPY config/bash /root/
+COPY config/bash/.bashrc /etc/bash.bashrc
 
 # Test php-fpm config and php info
 RUN php-fpm -tt
@@ -177,7 +179,6 @@ ENV PHP_ASSERT=1 \
     COMPOSER_CACHE_DIR=/.cache/composer/ \
     YARN_CACHE_FOLDER=/.cache/yarn/ \
     npm_config_cache=/.cache/npm/ \
-    TERM=xterm-256color \
     TIDEWAYS_DAEMON=""
 
 # enable debugging with PhpStorm

php/dev/bash/.bashrc php/config/bash/.bashrcphp/dev/bash/.bashrc renamed to php/config/bash/.bashrc

@@ -3,7 +3,10 @@
 # for examples
 
 # If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+case $- in
+	*i*) ;;
+	  *) return;;
+esac
 
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options