Skip to content

Commit 287ccbc

Browse files
committed
Fixed nginx entrypoint
1 parent 355c754 commit 287ccbc

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

docker/nginx/entrypoint.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@
77
# Detect correct path of document root
88
DOCUMENT_ROOT=$(readlink -f "/docker/$DOCUMENT_ROOT")
99

10-
cp /etc/nginx/sites-available/default.tpl /etc/nginx/sites-enabled/default
11-
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /etc/nginx/sites-enabled/default
12-
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /etc/nginx/sites-enabled/default
13-
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /etc/nginx/sites-enabled/default
14-
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /etc/nginx/sites-enabled/default
15-
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /etc/nginx/sites-enabled/default
16-
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /etc/nginx/sites-enabled/default
10+
rm -f -- /etc/nginx/conf.d/*.conf
11+
cp /opt/docker/vhost.conf /etc/nginx/conf.d/vhost.conf
12+
/bin/sed -i "s@<DOCUMENT_ROOT>@${DOCUMENT_ROOT}@" /etc/nginx/conf.d/vhost.conf
13+
/bin/sed -i "s@<TYPO3_CONTEXT>@${TYPO3_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
14+
/bin/sed -i "s@<FLOW_CONTEXT>@${FLOW_CONTEXT}@" /etc/nginx/conf.d/vhost.conf
15+
/bin/sed -i "s@<FLOW_REWRITEURLS>@${FLOW_REWRITEURLS}@" /etc/nginx/conf.d/vhost.conf
16+
/bin/sed -i "s@<FPM_HOST>@${MAIN_PORT_9000_TCP_ADDR}@" /etc/nginx/conf.d/vhost.conf
17+
/bin/sed -i "s@<FPM_PORT>@${MAIN_PORT_9000_TCP_PORT}@" /etc/nginx/conf.d/vhost.conf
1718

1819
#############################
1920
## COMMAND
2021
#############################
2122

2223
if [ "$1" = 'nginx' ]; then
23-
exec nginx
24+
exec nginx -g "daemon off;"
2425
fi
2526

2627
exec "$@"

0 commit comments

Comments
 (0)