From 013363000c6d08d0e336d38292a8cee65c04afae Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 1 Jul 2025 16:16:52 +0200
Subject: [PATCH] feat(docker): update tools and OS with latest versions

---
 Dockerfile       | 22 +++++++++++++---------
 fdroid-update.sh |  4 ++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ffcc6a5..a04b34f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,23 @@
-FROM reg.cadoles.com/proxy_cache/library/alpine:3.19 as build
+FROM reg.cadoles.com/proxy_cache/library/alpine:3.22 as build
 
-ARG FDROIDSERVER_VERSION=2.2
+ARG FDROIDSERVER_VERSION=2.4.2
+ARG ANDROGUARD_VERSION=4.1.3
+ARG FRIDA_TOOLS_VERSION=14.3.1
 ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
+ENV PIPX_HOME=/fdroid/
+ENV PIPX_BIN_DIR=/fdroid/bin
+
 RUN apk add --no-cache \
     python3 py3-pip build-base freetype-dev libffi-dev \
     libpng-dev py3-setuptools python3-dev libxml2-dev \
-    libxslt-dev openssl-dev jpeg-dev py3-qt5
+    libxslt-dev openssl-dev jpeg-dev py3-qt5 go nodejs npm git pipx
 
-RUN python3 -m venv --system-site-packages /fdroid
+RUN python3 -m venv --system-site-packages /fdroid \
+    && source /fdroid/bin/activate
+RUN pipx install androguard==${ANDROGUARD_VERSION} frida-tools==${FRIDA_TOOLS_VERSION} fdroidserver==${FDROIDSERVER_VERSION}
 
-RUN . /fdroid/bin/activate \
-    && pip3 install --no-cache-dir androguard==3.3.5 frida-tools==10.8.0 fdroidserver==${FDROIDSERVER_VERSION}
-
-FROM reg.cadoles.com/proxy_cache/library/alpine:3.19 as runtime
+FROM reg.cadoles.com/proxy_cache/library/alpine:3.22 as runtime
 
 ARG TIMEZONE=Europe/Paris
 
@@ -73,4 +77,4 @@ RUN mkdir -p /var/www/fdroid
 RUN addgroup -S fdroid && adduser -D -h /fdroid -s /bin/bash -G fdroid fdroid
 RUN chown -R fdroid: /fdroid /var/www/fdroid
 
-CMD /usr/local/bin/docker-entrypoint.sh
\ No newline at end of file
+CMD /usr/local/bin/docker-entrypoint.sh
diff --git a/fdroid-update.sh b/fdroid-update.sh
index 2543891..85db243 100644
--- a/fdroid-update.sh
+++ b/fdroid-update.sh
@@ -7,7 +7,7 @@ DIR=$2
 FILE=$3
 
 if [ -z "$FILE" ] || [[ "$FILE" == *.apk ]] || [[ "$FILE" == *.yml ]]; then
-    . /fdroid/bin/activate && fdroid update --clean -c --rename-apks --use-date-from-apk --delete-unknown
-    . /fdroid/bin/activate && fdroid deploy
+    /fdroid/bin/fdroid update --clean -c --rename-apks --use-date-from-apk --delete-unknown
+    /fdroid/bin/fdroid deploy
 fi