From 4dc990e1ffffc91146011f25e190ce2238e0afa9 Mon Sep 17 00:00:00 2001
From: Valadaress <57867475+Valadaress@users.noreply.github.com>
Date: Mon, 26 May 2025 19:49:08 -0300
Subject: [PATCH 1/2] Update Docker compose to newest version

---
 docker/Dockerfile         | 14 +++++++++++---
 docker/Dockerfile.contrib |  8 +++++---
 docker/docker-compose.yml |  4 +++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1d6985f6..dd5466d3 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..00357992 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 && \
+    wget && \
+    unzip && \
     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 $$!'

From c73cb60dbabf07e930d36e62a51eed9d16999d48 Mon Sep 17 00:00:00 2001
From: Valadaress <57867475+Valadaress@users.noreply.github.com>
Date: Mon, 26 May 2025 20:07:21 -0300
Subject: [PATCH 2/2] Adjust dependencies apt-get for Dockerfile and
 Dockerfile.contrib

---
 docker/Dockerfile         | 4 ++--
 docker/Dockerfile.contrib | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dd5466d3..042a8d84 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,8 +17,8 @@ RUN \
 # Install dependencies
 RUN \
     apt-get update && \
-    apt-get install -y && \
-    wget && \
+    apt-get install -y \
+    wget \
     unzip && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/Dockerfile.contrib b/docker/Dockerfile.contrib
index 00357992..0daf7d97 100644
--- a/docker/Dockerfile.contrib
+++ b/docker/Dockerfile.contrib
@@ -18,9 +18,9 @@ RUN \
 RUN \
     apt-get update && \
     apt-get install -y --no-install-recommends \
-    youtube-dl && \
-    wget && \
-    unzip && \
+    youtube-dl \
+    wget \
+    tar && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt