diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.ArchLinux | 30 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.alpine | 12 | ||||
| -rw-r--r-- | docker/Dockerfile.armv7 | 2 |
5 files changed, 1 insertions, 53 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 9be668d2f..989bf2986 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,11 +32,6 @@ RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a09 ## build final image FROM eclipse-temurin:24-jdk-noble AS app -RUN for i in 1 2 3; do \ - apt-get update && break || sleep 5; \ - done && \ - apt-get install -y --no-install-recommends wkhtmltopdf xvfb ghostscript && \ - rm -rf /var/lib/apt/lists/* LABEL maintainer="Michael Peter Christen <mc@yacy.net>" diff --git a/docker/Dockerfile.ArchLinux b/docker/Dockerfile.ArchLinux index ebe8428d0..b775ffe2b 100644 --- a/docker/Dockerfile.ArchLinux +++ b/docker/Dockerfile.ArchLinux @@ -45,36 +45,6 @@ ENV ANT_HOME="/opt/ant" ENV PATH="/opt/ant/bin:${PATH}" RUN ant -f /opt/ant/fetch.xml -Ddest=system -# install the latest version dependencies of Yacy (copied from the official Dockerfile) -RUN pacman -Sy imagemagick ruby qt5-tools qt5-doc gperf python xorg-server-xvfb ghostscript git qt5-svg qt5-xmlpatterns base-devel qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen hyphen-en hyphen-de woff2 cmake --noconfirm && \ -pacman -Scc --noconfirm -RUN useradd --no-create-home --shell=/bin/false build && \ -usermod -L build -USER build -WORKDIR /tmp - -# buid package for qt5-webkit from AUR -RUN git clone https://aur.archlinux.org/qt5-webkit.git && \ -cd qt5-webkit && \ -MAKEFLAGS="-j$(nproc)" makepkg --noconfirm && \ -cd .. -USER root - -# install the package -RUN pacman -U --noconfirm /tmp/qt5-webkit/qt5-webkit*.pkg.tar.zst && \ -rm -rf /tmp/qt5-webkit -USER build - -# build package for wkhtmltopdf from AUR -RUN git clone https://aur.archlinux.org/wkhtmltopdf.git && \ -cd wkhtmltopdf && \ -MAKEFLAGS="-j$(nproc)" makepkg --noconfirm --skippgpcheck && \ -cd .. -USER root - -# install the package -RUN pacman -U --noconfirm /tmp/wkhtmltopdf/wkhtmltopdf*.pkg.tar.zst && \ -rm -rf /tmp/wkhtmltopdf WORKDIR /opt # download the latest version of yacy diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 7ecdcb728..408a1fd47 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -30,11 +30,6 @@ RUN sed -i "/adminAccountBase64MD5=/c\adminAccountBase64MD5=MD5:8cffbc0d66567a09 ## build final image FROM arm64v8/openjdk:23-jdk-slim-bookworm AS app -RUN for i in 1 2 3; do \ - apt-get update && break || sleep 5; \ - done && \ - apt-get install -y --no-install-recommends wkhtmltopdf xvfb ghostscript && \ - rm -rf /var/lib/apt/lists/* LABEL maintainer="Michael Peter Christen <mc@yacy.net>" diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index eb3882eb5..220ac78d4 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -27,18 +27,9 @@ 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 surnet/alpine-wkhtmltopdf:3.21.2-0.12.6-small AS wkhtmltopdf FROM eclipse-temurin:21-jre-alpine-3.21 AS app RUN apk add --no-cache \ - imagemagick \ - xvfb \ - ghostscript \ - # Install dependencies for wkhtmltopdf - libstdc++ \ - libx11 \ - libxrender \ - libxext \ libssl3 \ ca-certificates \ fontconfig \ @@ -57,9 +48,6 @@ RUN apk add --no-cache \ && rm -rf /tmp/* \ && apk del .build-deps -# Copy wkhtmltopdf files from docker-wkhtmltopdf image -COPY --from=wkhtmltopdf /bin/wkhtmltopdf /bin/wkhtmltopdf - # copy YaCy to app image RUN addgroup yacy && adduser -S -G yacy -H -D yacy WORKDIR /opt diff --git a/docker/Dockerfile.armv7 b/docker/Dockerfile.armv7 index c1758be97..284cc83ab 100644 --- a/docker/Dockerfile.armv7 +++ b/docker/Dockerfile.armv7 @@ -11,7 +11,7 @@ FROM arm32v7/openjdk:11-jdk as builder # Install needed packages not in base image -RUN apt-get update && apt-get install -yq curl wkhtmltopdf imagemagick xvfb ghostscript && \ +RUN apt-get update && apt-get install -yq curl && \ rm -rf /var/lib/apt/lists/* # set current working dir & copy sources |