public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
[PHP-FPM] Use redis as session store
c62b467a
data/Dockerfiles/phpfpm/docker-entrypoint.sh | 13 +++++++++++--
docker-compose.yml | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)Diff
diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh
index 798a2585..20e9a405 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 cf0a028f..19ffcaf4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -111,7 +111,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
@@ -552,7 +552,7 @@ services:
aliases:
- dockerapi
-
+
##### Will be removed soon #####
solr-mailcow:
image: mailcow/solr:1.8.3