From f809c960ed475f4c2ac564cb4f99b39a9765b600 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:01:52 -0500
Subject: [PATCH 1/4] rebase to noble

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 readme-vars.yml    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3fdda7a8..baa82468 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8e682525..7c6ae818 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
 
 # set version label
 ARG BUILD_DATE
diff --git a/readme-vars.yml b/readme-vars.yml
index 7db4e9fc..dbcb8fec 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -104,6 +104,7 @@ init_diagram: |
   "calibre-web:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "05.12.24:", desc: "Rebase to noble."}
   - {date: "26.08.24:", desc: "Add new dep, xdg-utils."}
   - {date: "07.07.24:", desc: "Add new dep, libmagic1."}
   - {date: "17.10.23:", desc: "Remove some packages that are required by the calibre mod but not the base container."}

From 92296428cf064c82bb4e9e6ac472f596bec62666 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:12:25 -0500
Subject: [PATCH 2/4] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index baa82468..de0eeec9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,8 @@ RUN \
   apt-get install -y --no-install-recommends \
     imagemagick \
     ghostscript \
-    libldap-2.5-0 \
-    libmagic1 \
+    libldap2 \
+    libmagic1t64 \
     libsasl2-2 \
     libxi6 \
     libxslt1.1 \

From ef7fa6da19ea89381c17091c5fcd0eb38b560a8b Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:13:45 -0500
Subject: [PATCH 3/4] Update Dockerfile.aarch64

---
 Dockerfile.aarch64 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 7c6ae818..a509d858 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -29,8 +29,8 @@ RUN \
   apt-get install -y --no-install-recommends \
     imagemagick \
     ghostscript \
-    libldap-2.5-0 \
-    libmagic1 \
+    libldap2 \
+    libmagic1t64 \
     libsasl2-2 \
     libxi6 \
     libxslt1.1 \

From 04a183edfdba941799cbf67de654d8e26ee5e87c Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:37:01 -0500
Subject: [PATCH 4/4] set timezone for python

---
 Jenkinsfile      | 2 +-
 jenkins-vars.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 97ec55b6..902e88dc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
     CI_PORT='8083'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV='TZ=America/Los_Angeles'
     CI_AUTH='user:password'
     CI_WEBPATH=''
   }
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 512111c3..4b268450 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -25,6 +25,6 @@ repo_vars:
   - CI_PORT='8083'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV='TZ=America/Los_Angeles'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''