From a3df37c551561e0e1a61e546bcadf78267b38a76 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Wed, 16 Jul 2025 21:14:33 -0700
Subject: [PATCH] Bump base versions, add clamav to nextcloud image

---
 Jenkins/Dockerfile      | 2 +-
 NextCloud/Dockerfile    | 6 ++++--
 NextCloud/entrypoint.sh | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Jenkins/Dockerfile b/Jenkins/Dockerfile
index c028917..baf240f 100644
--- a/Jenkins/Dockerfile
+++ b/Jenkins/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get upgrade -y
 
 RUN apt-get install -y temurin-21-jdk curl wget moreutils && apt-get clean -y
 
-ENV JENKINS_VERSION 2.517
+ENV JENKINS_VERSION 2.519
 
 USER root
 WORKDIR /
diff --git a/NextCloud/Dockerfile b/NextCloud/Dockerfile
index bd0b938..d0695a2 100644
--- a/NextCloud/Dockerfile
+++ b/NextCloud/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /var/www
 RUN git clone https://github.com/nextcloud/server html
 
 WORKDIR /var/www/html
-RUN git checkout v31.0.4
+RUN git checkout v31.0.7
 RUN git submodule update --init --recursive
 
 RUN rm -rf .git
@@ -22,8 +22,10 @@ RUN apt-get install -y apache2 apache2-utils php8.2 php8.2-gd php8.2-mysql php8.
 
 RUN apt-get install -y php8.2-bcmath php8.2-gmp php8.2-intl cron
 
+RUN apt-get install -y clamav clamav-daemon
+
 ENV MOUNTPOINT /var/www/html
-ENV NEXTCLOUD_VERSION 31.0.4
+ENV NEXTCLOUD_VERSION 31.0.7
 
 WORKDIR /var/www/
 
diff --git a/NextCloud/entrypoint.sh b/NextCloud/entrypoint.sh
index 3726515..5088c0c 100644
--- a/NextCloud/entrypoint.sh
+++ b/NextCloud/entrypoint.sh
@@ -7,6 +7,7 @@ fi
 
 crontab /etc/crontab
 service cron start
+service clamav-daemon start
 
 chown -Rv www-data:www-data /var/www/html
 apache2ctl -D FOREGROUND
\ No newline at end of file