summaryrefslogtreecommitdiff
path: root/utils/lib_sxng_container.sh
diff options
context:
space:
mode:
authorIvan Gabaldon <igabaldon@inetol.net>2025-05-16 11:16:41 +0200
committerIvan Gabaldon <igabaldon@inetol.net>2025-05-20 11:49:30 +0200
commit749de829d5bad6a05ebe1a733a6bd942c1a386ec (patch)
tree95c26e4fb534f8f4926a3c367a047a4dae537a29 /utils/lib_sxng_container.sh
parenta195f5241262c71637d29d6fe5d18792eabe5a4d (diff)
[mod] container: refactor entrypoint script
That entrypoint is prone to screw things up, especially with permission handling. The new script handles initialization better and fixes some issues like delayed settings update via ENVs and timestamp overwriting, also adjusts what should be copied into the container. Related https://github.com/searxng/searxng/pull/4721#issuecomment-2850272129
Diffstat (limited to 'utils/lib_sxng_container.sh')
-rw-r--r--utils/lib_sxng_container.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/lib_sxng_container.sh b/utils/lib_sxng_container.sh
index 6e29a3809..fd0d072e2 100644
--- a/utils/lib_sxng_container.sh
+++ b/utils/lib_sxng_container.sh
@@ -114,7 +114,6 @@ container.build() {
# shellcheck disable=SC2086
"$container_engine" $params_build_builder \
--build-arg="TIMESTAMP_SETTINGS=$(git log -1 --format="%cd" --date=unix -- ./searx/settings.yml)" \
- --build-arg="TIMESTAMP_UWSGI=$(git log -1 --format="%cd" --date=unix -- ./container/uwsgi.ini)" \
--tag="localhost/$CONTAINER_IMAGE_ORGANIZATION/$CONTAINER_IMAGE_NAME:builder" \
--file="./container/$dockerfile" \
.
@@ -122,6 +121,8 @@ container.build() {
# shellcheck disable=SC2086
"$container_engine" $params_build \
+ --build-arg="TIMESTAMP_SETTINGS=$(git log -1 --format="%cd" --date=unix -- ./searx/settings.yml)" \
+ --build-arg="TIMESTAMP_UWSGI=$(git log -1 --format="%cd" --date=unix -- ./container/config/uwsgi.ini)" \
--build-arg="GIT_URL=$GIT_URL" \
--build-arg="SEARXNG_GIT_VERSION=$VERSION_STRING" \
--build-arg="LABEL_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \