From 024ea2618a0c88d172504f666e315bcef1d51e59 Mon Sep 17 00:00:00 2001 From: Samuel Howard Date: Thu, 3 Aug 2023 11:15:54 -0400 Subject: [PATCH 1/4] Added development docker-compose file for easier testing Signed-off-by: Samuel Howard --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 99b76f7..be69156 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ self_hosted_bible.egg-info/ notes.txt bibles/convert.py tests/speedtest.py +.gitignore bibles/json-bibles/amp.json bibles/json-bibles/amp.json.pbz2 From 8ce5cb42335bdd61868a0a49e8e31a8b12a5d3f3 Mon Sep 17 00:00:00 2001 From: Samuel Howard Date: Thu, 3 Aug 2023 11:16:35 -0400 Subject: [PATCH 2/4] Added development docker-compose file for easier testing Signed-off-by: Samuel Howard --- .dockerignore | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.dockerignore b/.dockerignore index fe5861d..b96fef7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -23,3 +23,4 @@ pictures/ .github/ bibles/json-bibles/csb.json bibles/json-bibles/net.json +docker-compose.yml diff --git a/.gitignore b/.gitignore index be69156..463f476 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ bibles/json-bibles/nlt.json bibles/json-bibles/nlt.json.pbz2 bibles/json-bibles/rsv.json bibles/json-bibles/rsv.json.pbz2 +/docker-compose.yml From 2de201cb7a469af7788915295f921f1776a3be52 Mon Sep 17 00:00:00 2001 From: Samuel Howard Date: Thu, 3 Aug 2023 11:26:43 -0400 Subject: [PATCH 3/4] Specified stop signal due to waitress not responding to SIGINT Signed-off-by: Samuel Howard --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 1c6c70d..28a8e6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ COPY --chmod=0755 . . EXPOSE 5000 +STOPSIGNAL SIGKILL CMD [ "/usr/src/app/daemon.sh" ] VOLUME /usr/src/app/bibles/json-bibles HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD wget http://localhost:5000/health -q -O - > /dev/null 2>&1 From a17d139b4b7e8ee8c892b76cf45d5a32efe78831 Mon Sep 17 00:00:00 2001 From: Samuel Howard Date: Thu, 3 Aug 2023 11:27:08 -0400 Subject: [PATCH 4/4] Removed armv7 support due to Brotli compression Signed-off-by: Samuel Howard --- README.md | 1 - makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d7f7ef3..07dbceb 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ A self-hosted webapp of various Bible versions including the KJV, ESV, and ASV. |:------------:|:---------:|--------| | x86-64 | ✅ | latest | | arm64v8 | ✅ | latest | -| arm32v7 | ✅ | latest | ## Examples *Note: Screen shots taken in dark mode
diff --git a/makefile b/makefile index cf88483..dcf8b64 100644 --- a/makefile +++ b/makefile @@ -1,2 +1,2 @@ build-and-push: - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag samhaswon/self-hosted-bible:latest . + docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag samhaswon/self-hosted-bible:latest .