From 8746d36845265c661b477c171fc953a0adb29257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Sun, 4 Oct 2020 14:13:31 +0200 Subject: [PATCH] Document database connection retries and change alpine repo for catatonit (cherry picked from commit 88e3835050c0418c060c8e3a704894763ee33aa0) --- .env.template | 4 ++++ docker/Dockerfile.j2 | 2 +- docker/arm32v7/Dockerfile.alpine | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.env.template b/.env.template index 04977ed8..4a19f249 100644 --- a/.env.template +++ b/.env.template @@ -82,6 +82,10 @@ ## cause performance degradation or might render the service unable to start. # ENABLE_DB_WAL=true +## Database connection retries +## Number of times to retry the database connection during startup, with 1 second delay between each retry, set to 0 to retry indefinitely +# DB_CONNECTION_RETRIES=15 + ## Disable icon downloading ## Set to true to disable icon downloading, this would still serve icons from $ICON_CACHE_FOLDER, ## but it won't produce any external network request. Needs to set $ICON_CACHE_TTL to 0, diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index 30237258..877fd74f 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -242,7 +242,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* {% endif %} {% if "alpine" in target_file and "arm32v7" in target_file %} -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing catatonit +RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/community catatonit {% endif %} RUN mkdir /data diff --git a/docker/arm32v7/Dockerfile.alpine b/docker/arm32v7/Dockerfile.alpine index d0c1354c..61376b8b 100644 --- a/docker/arm32v7/Dockerfile.alpine +++ b/docker/arm32v7/Dockerfile.alpine @@ -79,7 +79,7 @@ RUN apk add --no-cache \ openssl \ curl \ ca-certificates -RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing catatonit +RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/community catatonit RUN mkdir /data