From 0ab3507faf149a02d90f1b2323bdff29fb9f76ab Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sun, 30 Jul 2023 23:47:07 +0800
Subject: [PATCH] Update to nodejs 20 bookworm and use apt to install apprise

---
 docker/debian-base.dockerfile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/docker/debian-base.dockerfile b/docker/debian-base.dockerfile
index a78c7329c..2dd8dae99 100644
--- a/docker/debian-base.dockerfile
+++ b/docker/debian-base.dockerfile
@@ -1,11 +1,11 @@
 # If the image changed, the second stage image should be changed too
-FROM node:18-bullseye-slim AS base2-slim
+FROM node:20-bookworm-slim AS base2-slim
 ARG TARGETPLATFORM
 
 WORKDIR /app
 
 # Specify --no-install-recommends to skip unused dependencies, make the base much smaller!
-# python3* = apprise's dependencies
+# apprise = for notifications (From testing repo)
 # sqlite3 = for debugging
 # iputils-ping = for ping
 # util-linux = for setpriv (Should be dropped in 2.0.0?)
@@ -14,19 +14,16 @@ WORKDIR /app
 # ca-certificates = keep the cert up-to-date
 # sudo = for start service nscd with non-root user
 # nscd = for better DNS caching
-# (pip) apprise = for notifications
-RUN apt-get update && \
-    apt-get --yes --no-install-recommends install  \
-        python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
-        sqlite3  \
+RUN echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list && \
+    apt update && \
+    apt --yes --no-install-recommends -t testing install apprise sqlite3 ca-certificates && \
+    apt --yes --no-install-recommends -t stable install  \
         iputils-ping  \
         util-linux  \
         dumb-init  \
         curl  \
-        ca-certificates \
         sudo \
         nscd && \
-    pip3 --no-cache-dir install apprise==1.4.5 && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove
 
@@ -35,7 +32,7 @@ RUN apt-get update && \
 RUN curl https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyrings/cloudflare-main.gpg && \
     echo 'deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared bullseye main' | tee /etc/apt/sources.list.d/cloudflared.list && \
     apt update && \
-    apt install --yes --no-install-recommends cloudflared && \
+    apt install --yes --no-install-recommends -t stable cloudflared && \
     cloudflared version && \
     rm -rf /var/lib/apt/lists/* && \
     apt --yes autoremove