From f883d8738c0bb97ec57830ddd61b2decf61e1208 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 3 Jan 2024 13:15:05 -0800
Subject: [PATCH] docker: update base image

---
 install/docker/Dockerfile                      | 4 ++++
 install/docker/Dockerfile.full                 | 1 -
 install/docker/Dockerfile.lite                 | 3 ---
 install/docker/Dockerfile.s6                   | 4 ++++
 install/docker/Dockerfile.thin                 | 3 ---
 install/docker/template/Dockerfile.full.footer | 3 ---
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/install/docker/Dockerfile b/install/docker/Dockerfile
index 6f8b00dbd..520cb0af0 100644
--- a/install/docker/Dockerfile
+++ b/install/docker/Dockerfile
@@ -14,4 +14,8 @@ WORKDIR /server
 # https://github.com/nodejs/node/issues/41145#issuecomment-992948130
 ENV NODE_OPTIONS="--dns-result-order=ipv4first"
 
+# changing this forces pip and npm to perform reinstalls.
+# if this base image changes, this version must be updated.
+ENV SCRYPTED_BASE_VERSION="20240103"
+
 CMD npm --prefix /server exec scrypted-serve
diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full
index af239406e..1cbaa2b57 100644
--- a/install/docker/Dockerfile.full
+++ b/install/docker/Dockerfile.full
@@ -109,7 +109,6 @@ ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
 ENV SCRYPTED_DOCKER_FLAVOR="full"
 
 ################################################################
diff --git a/install/docker/Dockerfile.lite b/install/docker/Dockerfile.lite
index 976d3cdb7..b062d3863 100644
--- a/install/docker/Dockerfile.lite
+++ b/install/docker/Dockerfile.lite
@@ -44,7 +44,4 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
 ENV SCRYPTED_DOCKER_FLAVOR="lite"
diff --git a/install/docker/Dockerfile.s6 b/install/docker/Dockerfile.s6
index 7f8f18d6b..5073d61ad 100644
--- a/install/docker/Dockerfile.s6
+++ b/install/docker/Dockerfile.s6
@@ -44,4 +44,8 @@ WORKDIR /server
 # https://github.com/nodejs/node/issues/41145#issuecomment-992948130
 ENV NODE_OPTIONS="--dns-result-order=ipv4first"
 
+# changing this forces pip and npm to perform reinstalls.
+# if this base image changes, this version must be updated.
+ENV SCRYPTED_BASE_VERSION="20240103"
+
 CMD npm --prefix /server exec scrypted-serve
diff --git a/install/docker/Dockerfile.thin b/install/docker/Dockerfile.thin
index 45365e225..706feee7c 100644
--- a/install/docker/Dockerfile.thin
+++ b/install/docker/Dockerfile.thin
@@ -19,7 +19,4 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
 ENV SCRYPTED_DOCKER_FLAVOR="thin"
diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer
index 535d5881b..2c84f93f0 100644
--- a/install/docker/template/Dockerfile.full.footer
+++ b/install/docker/template/Dockerfile.full.footer
@@ -35,9 +35,6 @@ ENV SCRYPTED_INSTALL_PATH="/server"
 RUN test -f "/usr/bin/ffmpeg"
 ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
-# changing this forces pip and npm to perform reinstalls.
-# if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
 ENV SCRYPTED_DOCKER_FLAVOR="full"
 
 ################################################################