From a5a1f44441d79f0a0792b08e6912d67d1bd51380 Mon Sep 17 00:00:00 2001 From: Michael Meier Date: Thu, 4 Jun 2026 22:18:23 +0200 Subject: Docker: Fix YaCy version determination The .dockerignore file was preventing the .git directory from being copied into the context during container builds, which prevented ant from determining the YaCy version by running a few git commands. This fixes containerized YaCy peer's version showing up as: yacy_v1.941_fatal: not a git repository (or any of the parent directories): .gitfatal: not a git repository (or any of the parent directories): .git_fatal: not a git repository (or any of the parent directories): .git --- docker/Dockerfile | 5 ++++- docker/Dockerfile.aarch64 | 5 ++++- docker/Dockerfile.alpine | 5 ++++- docker/Dockerfile.armv7 | 4 ++++ 4 files changed, 16 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 318b978e6..9be668d2f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,7 +20,10 @@ RUN for i in 1 2 3; do \ # set current working dir & copy sources WORKDIR /opt COPY . /opt/yacy_search_server/ -RUN ant compile -f /opt/yacy_search_server/build.xml +# .git dir deleted here because .git is needed during the build to deterime the version, +# but isn't required at runtime +RUN ant compile -f /opt/yacy_search_server/build.xml \ + && rm -fr /opt/yacy_search_server/.git # Set initial admin password: "yacy" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a0987a4aba1ec46d63c" /opt/yacy_search_server/defaults/yacy.init && \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index a01225ac2..7ecdcb728 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -18,7 +18,10 @@ RUN for i in 1 2 3; do \ # compile YaCy WORKDIR /opt COPY . /opt/yacy_search_server/ -RUN ant compile -f /opt/yacy_search_server/build.xml +# .git dir deleted here because .git is needed during the build to deterime the version, +# but isn't required at runtime +RUN ant compile -f /opt/yacy_search_server/build.xml \ + && rm -fr /opt/yacy_search_server/.git # Set initial admin password: "yacy" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a0987a4aba1ec46d63c" /opt/yacy_search_server/defaults/yacy.init && \ diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 720141774..eb3882eb5 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -16,7 +16,10 @@ RUN apk add --no-cache curl git apache-ant # set current working dir & copy sources WORKDIR /opt COPY . /opt/yacy_search_server/ -RUN ant compile -f /opt/yacy_search_server/build.xml +# .git dir deleted here because .git is needed during the build to deterime the version, +# but isn't required at runtime +RUN ant compile -f /opt/yacy_search_server/build.xml \ + && rm -fr /opt/yacy_search_server/.git # Set initial admin password: "yacy" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a0987a4aba1ec46d63c" /opt/yacy_search_server/defaults/yacy.init && \ diff --git a/docker/Dockerfile.armv7 b/docker/Dockerfile.armv7 index 285f84d1d..c1758be97 100644 --- a/docker/Dockerfile.armv7 +++ b/docker/Dockerfile.armv7 @@ -18,12 +18,16 @@ RUN apt-get update && apt-get install -yq curl wkhtmltopdf imagemagick xvfb ghos WORKDIR /opt COPY . /opt/yacy_search_server/ +# .git dir deleted here because .git is needed during the build to deterime the version, +# but isn't required at runtime +RUN ant compile -f /opt/yacy_search_server/build.xml \ RUN rm -rf /opt/yacy_search_server/.git && \ apt-get update && \ apt-get install -yq ant && \ ant compile -f /opt/yacy_search_server/build.xml && \ apt-get purge -yq --auto-remove ant && \ apt-get clean && \ + rm -fr /opt/yacy_search_server/.git && \ rm -rf /var/lib/apt/lists/* # Set initial admin password: "yacy" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) -- cgit v1.2.3