diff options
| author | Michael Christen <Orbiter@users.noreply.github.com> | 2025-06-19 11:14:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-19 11:14:34 +0200 |
| commit | 84bb610f4be832875898af4c4a9884e5d551c6d4 (patch) | |
| tree | 438f362f8ccb58d9d80569546cb1533d44b2ed48 /docker | |
| parent | 809515acbf070dad9c7d9d56a5dca09f00a59009 (diff) | |
| parent | b0a94aba8f337b12f7775ce2d4d90041cfa2f39b (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index ca201b1f7..3967b0728 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,17 +6,14 @@ # run with # docker run -d --name yacy -p 8090:8090 -p 8443:8443 -v yacy_data:/opt/yacy_search_server/DATA --log-opt max-size=200m --log-opt max-file=2 yacy/yacy_search_server:latest + ## builder image -FROM eclipse-temurin:21-jdk AS builder -RUN apt-get update && apt-get install -y --no-install-recommends \ - ant \ - git \ - curl \ - && rm -rf /var/lib/apt/lists/* +FROM eclipse-temurin:24-jdk-noble AS builder +RUN apt-get update && apt-get install -y --no-install-recommends ant git curl && rm -rf /var/lib/apt/lists/* +# compile YaCy WORKDIR /opt COPY . /opt/yacy_search_server/ - RUN ant compile -f /opt/yacy_search_server/build.xml # Set initial admin password: "yacy" (encoded with custom yacy md5 function net.yacy.cora.order.Digest.encodeMD5Hex()) @@ -26,16 +23,11 @@ RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a09 sed -i "/server.https=false/c\server.https=true" /opt/yacy_search_server/defaults/yacy.init ## build final image -FROM eclipse-temurin:21-jre AS app - -RUN apt-get update && apt-get install -y --no-install-recommends \ - wkhtmltopdf \ - xvfb \ - ghostscript \ - && rm -rf /var/lib/apt/lists/* - +FROM eclipse-temurin:24-jdk-noble AS app +RUN apt-get update && apt-get install -y --no-install-recommends wkhtmltopdf xvfb ghostscript && rm -rf /var/lib/apt/lists/* LABEL maintainer="Michael Peter Christen <mc@yacy.net>" +# copy YaCy to app image RUN adduser --system --group --no-create-home --disabled-password yacy WORKDIR /opt COPY --chown=yacy:yacy --from=builder /opt/yacy_search_server /opt/yacy_search_server |