diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 798a25851..20e9a405c 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -10,16 +10,25 @@ done # Do not attempt to write to slave if [[ ! -z ${REDIS_SLAVEOF_IP} ]]; then - REDIS_CMDLINE="redis-cli -h ${REDIS_SLAVEOF_IP} -p ${REDIS_SLAVEOF_PORT}" + REDIS_HOST=$REDIS_SLAVEOF_IP + REDIS_PORT=$REDIS_SLAVEOF_PORT else - REDIS_CMDLINE="redis-cli -h redis -p 6379" + REDIS_HOST="redis" + REDIS_PORT="6379" fi +REDIS_CMDLINE="redis-cli -h ${REDIS_HOST} -p ${REDIS_PORT}" until [[ $(${REDIS_CMDLINE} PING) == "PONG" ]]; do echo "Waiting for Redis..." sleep 2 done +# Set redis session store +echo -n ' +session.save_handler = redis +session.save_path = "tcp://'${REDIS_HOST}':'${REDIS_PORT}'" +' > /usr/local/etc/php/conf.d/session_store.ini + # Check mysql_upgrade (master and slave) CONTAINER_ID= until [[ ! -z "${CONTAINER_ID}" ]] && [[ "${CONTAINER_ID}" =~ ^[[:alnum:]]*$ ]]; do diff --git a/docker-compose.yml b/docker-compose.yml index 6023a9072..427e902ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.89 + image: mailcow/phpfpm:1.90 command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: - redis-mailcow @@ -553,7 +553,7 @@ services: aliases: - dockerapi - + ##### Will be removed soon ##### solr-mailcow: image: mailcow/solr:1.8.3