diff --git a/docker/Dockerfile b/docker/Dockerfile index 1d6985f6..042a8d84 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,8 @@ -ARG java=11-jre +ARG java=21-jdk-slim FROM openjdk:${java} -ARG version="3.4.0-20210923" +ARG version="3.9.0" ARG user="heritrix" ARG userid=1000 @@ -14,10 +14,18 @@ RUN \ groupadd -g $userid $user && \ useradd -r -u $userid -g $user $user +# Install dependencies +RUN \ + apt-get update && \ + apt-get install -y \ + wget \ + unzip && \ + rm -rf /var/lib/apt/lists/* + WORKDIR /opt # download latest version according to: -# https://github.com/internetarchive/heritrix3/releases/tag/3.4.0-20210923 +# https://github.com/internetarchive/heritrix3/releases/tag/3.9.0 RUN \ wget -O heritrix-${version}-dist.zip https://repo1.maven.org/maven2/org/archive/heritrix/heritrix/${version}/heritrix-${version}-dist.zip && \ unzip heritrix-${version}-dist.zip && \ diff --git a/docker/Dockerfile.contrib b/docker/Dockerfile.contrib index 5a0f797b..0daf7d97 100644 --- a/docker/Dockerfile.contrib +++ b/docker/Dockerfile.contrib @@ -1,8 +1,8 @@ -ARG java=8-jre +ARG java=21-jdk-slim FROM openjdk:${java} -ARG version="3.4.0-20210923" +ARG version="3.9.0" ARG user="heritrix" ARG userid=1000 @@ -14,11 +14,13 @@ RUN \ groupadd -g $userid $user && \ useradd -r -u $userid -g $user $user -# install other requirements (for contrib) +# install dependencies and other requirements (for contrib) RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ - youtube-dl && \ + youtube-dl \ + wget \ + tar && \ rm -rf /var/lib/apt/lists/* WORKDIR /opt diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b1dba574..ff6d342b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,9 @@ version: "3.7" services: heritrix: - image: heritrix + build: + context: . + dockerfile: Dockerfile container_name: heritrix # TEST: keeps the container running without doing anything (for inspections) # entrypoint: bash -c 'while :; do :; done & kill -STOP $$! && wait $$!'