mykitserver/docker-limesurvey
1
0
Fork 0
mirror of https://github.com/mykitserver/docker-limesurvey.git synced 2025-12-06 16:39:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Customize Apache listen port (#59)

Browse Source 
* Overwrite apache listen port in Apache configuration if configured via environment variable LISTEN_PORT
* Add documenation to README
* Add default value to ENV vars documentation

Co-authored-by: Michael Prankl <michael.prankl@muenchen.de>
This commit is contained in:
Michael Prankl
2021-05-01 13:12:43 +02:00
committed by GitHub
parent c8d36cf425
commit 01f6b41082
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
# force LF in entrypoint.sh
entrypoint.sh text eol=lf

7
3.0/apache/entrypoint.sh
View File

@@ -23,6 +23,8 @@ URL_FORMAT=${URL_FORMAT:-'path'}
DEBUG=${DEBUG:-0} DEBUG=${DEBUG:-0}
DEBUG_SQL=${DEBUG_SQL:-0} DEBUG_SQL=${DEBUG_SQL:-0}
LISTEN_PORT=${LISTEN_PORT:-"80"}
if [ -z "$DB_PASSWORD" ]; then if [ -z "$DB_PASSWORD" ]; then
echo >&2 'Error: Missing DB_PASSWORD' echo >&2 'Error: Missing DB_PASSWORD'
exit 1 exit 1
@@ -33,6 +35,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
exit 1 exit 1
fi fi
if [ "$LISTEN_PORT" != "80" ]; then
echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
fi
# Check if database is available # Check if database is available
if [ -z "$DB_SOCK" ]; then if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT until nc -z -v -w30 $DB_HOST $DB_PORT

7
4.0/apache/entrypoint.sh
View File

@@ -27,6 +27,8 @@ URL_FORMAT=${URL_FORMAT:-'path'}
DEBUG=${DEBUG:-0} DEBUG=${DEBUG:-0}
DEBUG_SQL=${DEBUG_SQL:-0} DEBUG_SQL=${DEBUG_SQL:-0}
LISTEN_PORT=${LISTEN_PORT:-"80"}
if [ -z "$DB_PASSWORD" ]; then if [ -z "$DB_PASSWORD" ]; then
echo >&2 'Error: Missing DB_PASSWORD' echo >&2 'Error: Missing DB_PASSWORD'
exit 1 exit 1
@@ -37,6 +39,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
exit 1 exit 1
fi fi
if [ "$LISTEN_PORT" != "80" ]; then
echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
fi
# Check if database is available # Check if database is available
if [ -z "$DB_SOCK" ]; then if [ -z "$DB_SOCK" ]; then
until nc -z -v -w30 $DB_HOST $DB_PORT until nc -z -v -w30 $DB_HOST $DB_PORT

3
README.md
View File

@@ -31,6 +31,8 @@ To change to Apache Webserver configuration, mount a Volume into the Container a
See the example configuration provided. See the example configuration provided.
If you want to run Apache on a non-privileged port inside the container, just specify a environment variable `LISTEN_PORT` (e.g. `LISTEN_PORT=8080`).
# Using the fpm Image # Using the fpm Image
To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. See *docker-compose.fpm.yml* for example. To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. See *docker-compose.fpm.yml* for example.
@@ -112,6 +114,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
| ENCRYPT_KEYPAIR | Data encryption keypair | | ENCRYPT_KEYPAIR | Data encryption keypair |
| ENCRYPT_PUBLIC_KEY | Data encryption public key | | ENCRYPT_PUBLIC_KEY | Data encryption public key |
| ENCRYPT_SECRET_KEY | Data encryption secret key | | ENCRYPT_SECRET_KEY | Data encryption secret key |
| LISTEN_PORT | Apache: Listen port. Default: 80 |
For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings