diff options
| -rw-r--r-- | .dockerignore | 3 | ||||
| -rw-r--r-- | .github/workflows/build-docker-image.yaml | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 38 |
3 files changed, 22 insertions, 25 deletions
diff --git a/.dockerignore b/.dockerignore index 0f41b6fc7..484cdc123 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,5 @@ +.git +.github DATA* RELEASE yacy.log @@ -8,4 +10,3 @@ examples build.nsi README.md Heroku.md - diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 6016fca59..ee103b023 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -22,9 +22,9 @@ jobs: matrix: include: - tag: "" # Default Dockerfile - platforms: linux/amd64,linux/arm64 - - tag: alpine - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm,linux/riscv64 + # - tag: alpine + # platforms: linux/amd64,linux/arm64 runs-on: ubuntu-latest steps: diff --git a/docker/Dockerfile b/docker/Dockerfile index 968584c1a..ec886b8c3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,42 +6,38 @@ # 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 -## build base -FROM eclipse-temurin:21 AS base -RUN apt-get update && apt-get install -yq wkhtmltopdf imagemagick xvfb ghostscript && rm -rf /var/lib/apt/lists/* - -## build app -FROM base AS appbuilder - -RUN apt-get update && apt-get install -yq ant git curl && rm -rf /var/lib/apt/lists/* -RUN java -version +## build +FROM eclipse-temurin:21 AS builder +RUN apt-get update && apt-get install -y --no-install-recommends \ + ant \ + git \ + curl \ + && rm -rf /var/lib/apt/lists/* WORKDIR /opt COPY . /opt/yacy_search_server/ -RUN ant compile -f /opt/yacy_search_server/build.xml && \ - apt-get purge -yq --auto-remove ant && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -WORKDIR /opt/yacy_search_server/ -#RUN git rev-parse HEAD > .git/shallow && \ -# git tag -l | xargs git tag -d && \ -# git gc --prune=now +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()) RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a0987a4aba1ec46d63c" /opt/yacy_search_server/defaults/yacy.init && \ sed -i "/adminAccountForLocalhost=/c\adminAccountForLocalhost=false" /opt/yacy_search_server/defaults/yacy.init && \ 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/* -## build dist -FROM base LABEL maintainer="Michael Peter Christen <mc@yacy.net>" RUN adduser --system --group --no-create-home --disabled-password yacy WORKDIR /opt -COPY --chown=yacy:yacy --from=appbuilder /opt/yacy_search_server /opt/yacy_search_server +COPY --chown=yacy:yacy --from=builder /opt/yacy_search_server /opt/yacy_search_server EXPOSE 8090 8443 VOLUME ["/opt/yacy_search_server/DATA"] |