From 053df1f31259c72fae263415980039123907ac38 Mon Sep 17 00:00:00 2001 From: luccioman Date: Wed, 17 Oct 2018 08:42:31 +0200 Subject: [PATCH] Added support for snapshots generation to Docker images --- docker/Dockerfile | 9 +++++---- docker/Dockerfile.alpine | 10 ++++++---- docker/Readme.md | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9e5cd690a..929cb6b9f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,11 @@ # Build a docker image from latest YaCy sources -# Base image : latest stable official jdk image from Docker (Debian based) -FROM openjdk:latest +# Base image : latest Debian stable official jdk 8 image from Docker +FROM openjdk:8-stretch -# Install needed packages not in base image -RUN apt-get update && apt-get install -yq curl && \ +# Install needed packages not in base image +# (curl for sh scripts in /bin, and wkhtmltopdf,imagemagick,xvfb and ghostscript to enable PDF and image snapshot generation) +RUN apt-get update && apt-get install -yq curl wkhtmltopdf imagemagick xvfb ghostscript && \ rm -rf /var/lib/apt/lists/* # trace java version diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index b6d7acede..7ed3e840c 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,13 +1,15 @@ # Build a docker image from latest YaCy sources on Alpine Linux -# Base image : latest stable official jdk image from Docker based on Alpine Linux -FROM openjdk:alpine +# Base image : latest stable official jdk 8 image from Docker based on Alpine Linux +FROM openjdk:8-alpine # trace java version RUN java -version # Install needed packages not in base image -RUN apk add --no-cache curl +# (curl for sh scripts in /bin, and wkhtmltopdf,imagemagick,xvfb and ghostscript to enable PDF and image snapshot generation) +RUN apk add --no-cache curl imagemagick xvfb ghostscript && \ + apk add wkhtmltopdf --no-cache --repository https://dl-3.alpinelinux.org/alpine/edge/testing/ # set current working dir WORKDIR /tmp @@ -81,4 +83,4 @@ VOLUME ["/opt/yacy_search_server/DATA"] USER yacy # Start yacy as a foreground process (-f) to display console logs and to wait for yacy process -CMD ["/bin/sh","/opt/yacy_search_server/startYACY.sh","-f"] +CMD ["/bin/sh","/opt/yacy_search_server/startYACY.sh","-f"] \ No newline at end of file diff --git a/docker/Readme.md b/docker/Readme.md index 88e906864..77ed1d899 100644 --- a/docker/Readme.md +++ b/docker/Readme.md @@ -27,11 +27,11 @@ To build the Alpine variant : `luccioman/yacy:latest` -This image is based on latest stable official Debian [openjdk](https://hub.docker.com/_/openjdk/) image provided by Docker. Embed Yacy compiled from latest git repository sources. +This image is based on latest stable official Debian stable [openjdk](https://hub.docker.com/_/openjdk/) 8 image provided by Docker. Embed Yacy compiled from latest git repository sources. `luccioman/yacy:latest-alpine` -This image is based on latest stable official Alpine Linux [openjdk](https://hub.docker.com/_/openjdk/) image provided by Docker. Embed Yacy compiled from latest git repository sources. +This image is based on latest stable official Alpine Linux [openjdk](https://hub.docker.com/_/openjdk/) 8 image provided by Docker. Embed Yacy compiled from latest git repository sources. ## Default admin account