From a978f2c412d9088ca85229a72745ef540074ba50 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Sun, 2 Feb 2025 20:34:26 +0000
Subject: [PATCH 1/2] Temp build fix

---
 Dockerfile         | 31 +++++++++++++------------------
 Dockerfile.aarch64 | 31 +++++++++++++------------------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 735040e..39704a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ FROM ghcr.io/by275/libtorrent:2-alpine3.19 AS libtorrent
 
 FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
+COPY --from=ghcr.io/astral-sh/uv:0.5.26 /uv /uvx /bin/
+
 # set version label
 ARG BUILD_DATE
 ARG VERSION
@@ -16,7 +18,10 @@ LABEL maintainer="thespad"
 # environment settings
 ENV HOME="/config" \
   PYTHONIOENCODING=utf-8 \
-  TMPDIR=/run/flexget-temp
+  TMPDIR=/run/flexget-temp \
+  UV_PROJECT_ENVIRONMENT=/lsiopy \
+  UV_COMPILE_BYTECODE=1 \
+  UV_LINK_MODE=copy
 
 RUN \
   echo "**** install packages ****" && \
@@ -36,28 +41,18 @@ RUN \
     FLEXGET_VERSION=$(curl -s https://api.github.com/repos/flexget/flexget/releases/latest \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
-  mkdir -p /tmp/flexget && \
-  mkdir -p /data && \
+  mkdir -p /run/flexget-temp /data && \
+  mkdir -p /app/flexget && \
   curl -o \
     /tmp/flexget.tar.gz -L \
     "https://github.com/Flexget/Flexget/archive/refs/tags/${FLEXGET_VERSION}.tar.gz" && \
   tar xf \
     /tmp/flexget.tar.gz -C \
-    /tmp/flexget --strip-components=1 && \
-  cd /tmp/flexget && \
-  python3 -m venv /lsiopy && \
-  pip install -U --no-cache-dir \
-    pip \
-    wheel && \
-  pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
-    click \
-    flexget==${FLEXGET_VERSION#v} \
-    requests \
-    -r requirements.txt \
-    -r ./requirements/deluge.txt \
-    -r ./requirements/qbittorrent.txt \
-    -r ./requirements/telegram.txt \
-    -r ./requirements/transmission.txt && \
+    /app/flexget --strip-components=1 && \
+  cd /app/flexget && \
+  uv venv /lsiopy && \
+  uv run bundle_webui.py && \
+  uv sync --frozen --no-dev --no-cache --group=all && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index b277a5e..c87be18 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -6,6 +6,8 @@ FROM ghcr.io/by275/libtorrent:2-alpine3.19 AS libtorrent
 
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
+COPY --from=ghcr.io/astral-sh/uv:0.5.26 /uv /uvx /bin/
+
 # set version label
 ARG BUILD_DATE
 ARG VERSION
@@ -16,7 +18,10 @@ LABEL maintainer="thespad"
 # environment settings
 ENV HOME="/config" \
   PYTHONIOENCODING=utf-8 \
-  TMPDIR=/run/flexget-temp
+  TMPDIR=/run/flexget-temp \
+  UV_PROJECT_ENVIRONMENT=/lsiopy \
+  UV_COMPILE_BYTECODE=1 \
+  UV_LINK_MODE=copy
 
 RUN \
   echo "**** install packages ****" && \
@@ -36,28 +41,18 @@ RUN \
     FLEXGET_VERSION=$(curl -s https://api.github.com/repos/flexget/flexget/releases/latest \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
-  mkdir -p /tmp/flexget && \
-  mkdir -p /data && \
+  mkdir -p /run/flexget-temp /data && \
+  mkdir -p /app/flexget && \
   curl -o \
     /tmp/flexget.tar.gz -L \
     "https://github.com/Flexget/Flexget/archive/refs/tags/${FLEXGET_VERSION}.tar.gz" && \
   tar xf \
     /tmp/flexget.tar.gz -C \
-    /tmp/flexget --strip-components=1 && \
-  cd /tmp/flexget && \
-  python3 -m venv /lsiopy && \
-  pip install -U --no-cache-dir \
-    pip \
-    wheel && \
-  pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
-    click \
-    flexget==${FLEXGET_VERSION#v} \
-    requests \
-    -r requirements.txt \
-    -r ./requirements/deluge.txt \
-    -r ./requirements/qbittorrent.txt \
-    -r ./requirements/telegram.txt \
-    -r ./requirements/transmission.txt && \
+    /app/flexget --strip-components=1 && \
+  cd /app/flexget && \
+  uv venv /lsiopy && \
+  uv run bundle_webui.py && \
+  uv sync --frozen --no-dev --no-cache --group=all && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \

From 95dba1da00ac7a10758d50d0391fa8f549f36a10 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Sun, 2 Feb 2025 20:43:36 +0000
Subject: [PATCH 2/2] Set TZ in CI vars

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

diff --git a/Jenkinsfile b/Jenkinsfile
index f91f97d..71b2612 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
     CI_PORT='5050'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV=''
+    CI_DOCKERENV='TZ=Europe/London'
     CI_AUTH=''
     CI_WEBPATH=''
   }
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index b6ae7a0..213485a 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -24,7 +24,7 @@ repo_vars:
   - CI_PORT='5050'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV=''
+  - CI_DOCKERENV='TZ=Europe/London'
   - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links: