Skip to content

Commit

Permalink
docker: fix apache foreground
Browse files Browse the repository at this point in the history
  • Loading branch information
cboucheIGN committed Dec 3, 2024
1 parent 83d4a67 commit 77564fe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
10 changes: 1 addition & 9 deletions .docker/apache2-foreground
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,8 @@ set -e

# Adapted from docker/php removing folders creation at runtime (requires root)
# src : https://github.com/docker-library/php/blob/master/8.3/bullseye/apache/apache2-foreground
source /etc/apache2/envvars

: "${APACHE_CONFDIR:=/etc/apache2}"
: "${APACHE_ENVVARS:=$APACHE_CONFDIR/envvars}"
if test -f "$APACHE_ENVVARS"; then
. "$APACHE_ENVVARS"
fi

# Apache gets grumpy about PID files pre-existing
: "${APACHE_RUN_DIR:=/var/run/apache2}"
: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
rm -f "$APACHE_PID_FILE"

# Start apache forwarding SIGINT and SIGTERM to SIGWINCH
Expand Down
6 changes: 0 additions & 6 deletions .docker/application.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ run(){
bin/console doctrine:schema:update --force --complete
fi

# Ensure apache2 can read /etc/apache2/envvars
# if not we got the following error
# apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot
mkdir -p /var/run/apache2
source /etc/apache2/envvars

#---------------------------------------------------------------------------
# start apache2 server
#---------------------------------------------------------------------------
Expand Down

0 comments on commit 77564fe

Please sign in to comment.