aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-21 11:06:09 +02:00
Code Activity

Fix for issue #420, entrypoint has a race condition where installation fails if DB is not ready in time.

Browse source 
Signed-off-by: Daniel Hodgson <toasty27@gmail.com>
This commit is contained in:
Daniel Hodgson 2021-03-04 18:00:40 -08:00
parent f1ca6dbfab
commit 6544bd2b3d
3 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile-alpine.template
View file

@ -128,5 +128,8 @@ RUN set -ex; \
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/* /usr/src/nextcloud/config/
# wait-for-it.sh is used for waiting on networked DB's to become available during install
ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /usr/bin/wait-for-it
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

3
Dockerfile-debian.template
View file

@ -145,5 +145,8 @@ RUN set -ex; \
COPY *.sh upgrade.exclude / COPY *.sh upgrade.exclude /
COPY config/* /usr/src/nextcloud/config/ COPY config/* /usr/src/nextcloud/config/
# wait-for-it.sh is used for waiting on networked DB's to become available during install
ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh /usr/bin/wait-for-it
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"] CMD ["%%CMD%%"]

25
docker-entrypoint.sh
View file

@ -19,6 +19,21 @@ run_as() {
fi fi
} }
#Test for a port in host string, set default port if none provided
get_host_string() {
local host_string="$1"
local default_port="$2"
local host=""
local port=""
case "$host_string" in
(*:*) host="$host_string";;
(*) host="${host_string}:${default_port}";;
esac
echo "$host"
}
# usage: file_env VAR [DEFAULT] # usage: file_env VAR [DEFAULT]
# ie: file_env 'XYZ_DB_PASSWORD' 'example' # ie: file_env 'XYZ_DB_PASSWORD' 'example'
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of # (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
@ -139,17 +154,27 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"' install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
install=true install=true
network_db=true
db_host=$(get_host_string $MYSQL_HOST 3306) #Add default port for MySQL to host string if no port is provided
elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"' install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
install=true install=true
network_db=true
db_host=$(get_host_string $POSTGRES_HOST 5432) #Add default port for Postgres to host string if no port is provided
fi fi
if [ "$install" = true ]; then if [ "$install" = true ]; then
echo "starting nextcloud installation" echo "starting nextcloud installation"
max_retries=10 max_retries=10
try=0 try=0
if [ "$network_db" = true ]; then
#Wait indefinitely for DB to become available by default, otherwise wait seconds defined by $WAIT_TIMEOUT
wait-for-it -t ${WAIT_TIMEOUT:-0} $db_host -- echo "Database service online"
fi
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
do do
echo "retrying install..." echo "retrying install..."