From 6ae2f31402fc6782239d5a8ee7cacbb48863f11d Mon Sep 17 00:00:00 2001
From: mrhotio <26902309+mrhotio@users.noreply.github.com>
Date: Sat, 27 Apr 2024 06:34:36 +0200
Subject: [PATCH] rebase to ubuntu

---
 VERSION.json           |  6 +++---
 linux-amd64.Dockerfile | 10 ++++++++--
 linux-arm64.Dockerfile | 10 ++++++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/VERSION.json b/VERSION.json
index 56474fc98..181188f7a 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -4,9 +4,9 @@
   "test_amd64": true,
   "test_arm64": true,
   "test_url": "http://localhost:32400/web",
-  "upstream_digest_amd64": "sha256:81d80abc4fd0243787d219f344b702915c6fed097f2d198183687681d83715f6",
-  "upstream_digest_arm64": "sha256:8b1217064599410503a0de18b1e14bd86cfc7faba3e88746974700616c186ad0",
+  "upstream_digest_amd64": "sha256:b52d8da7eafaa958032b365acddcca22f0be66b219ef90ccf41c13d12ac8a31c",
+  "upstream_digest_arm64": "sha256:705e637608cf6c9c5f584a9d0402aca006985ddaa9bf92e9d1b3562155bd67ca",
   "upstream_image": "ghcr.io/hotio/base",
-  "upstream_tag": "alpinevpn",
+  "upstream_tag": "jammyvpn",
   "version": "1.40.2.8395-c67dce28e"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
index c2826634d..ec6cfd752 100644
--- a/linux-amd64.Dockerfile
+++ b/linux-amd64.Dockerfile
@@ -7,8 +7,14 @@ VOLUME ["/transcode"]
 ARG IMAGE_STATS
 ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="32400/tcp,32400/udp" PLEX_CLAIM_TOKEN="" PLEX_ADVERTISE_URL="" PLEX_NO_AUTH_NETWORKS="" PLEX_BETA_INSTALL="false" PLEX_PURGE_CODECS="false"
 
-RUN apk add --no-cache dpkg && \
-    apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community xmlstarlet
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt update && \
+    apt install -y --no-install-recommends --no-install-suggests \
+        xmlstarlet && \
+# clean up
+    apt autoremove -y && \
+    apt clean && \
+    rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
 
 # install plex
 ARG VERSION
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
index bbcf097be..4ba998d97 100644
--- a/linux-arm64.Dockerfile
+++ b/linux-arm64.Dockerfile
@@ -7,8 +7,14 @@ VOLUME ["/transcode"]
 ARG IMAGE_STATS
 ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="32400/tcp,32400/udp" PLEX_CLAIM_TOKEN="" PLEX_ADVERTISE_URL="" PLEX_NO_AUTH_NETWORKS="" PLEX_BETA_INSTALL="false" PLEX_PURGE_CODECS="false"
 
-RUN apk add --no-cache dpkg && \
-    apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community xmlstarlet
+ARG DEBIAN_FRONTEND="noninteractive"
+RUN apt update && \
+    apt install -y --no-install-recommends --no-install-suggests \
+        xmlstarlet && \
+# clean up
+    apt autoremove -y && \
+    apt clean && \
+    rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
 
 # install plex
 ARG VERSION