From 08a5c2f2b3587deb61af9f7825e5ed6b555dc4d9 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 22 Mar 2023 14:00:22 -0700 Subject: [PATCH] docker: set SCRYPTED_BASE_VERSION --- docker/Dockerfile | 3 --- docker/Dockerfile.full | 4 ++++ docker/Dockerfile.lite | 4 ++++ docker/Dockerfile.thin | 4 ++++ docker/template/Dockerfile.full.footer | 4 ++++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 554c8b2ce..0a194957a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,9 +1,6 @@ ARG BASE="18-bullseye-full" FROM koush/scrypted-common:${BASE} -# changing this forces pip and npm to perform reinstalls -ENV SCRYPTED_BASE_VERSION=20230322 - WORKDIR / # cache bust ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full index 521cb17cf..d0970dfd6 100644 --- a/docker/Dockerfile.full +++ b/docker/Dockerfile.full @@ -89,6 +89,10 @@ ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" +# changing this forces pip and npm to perform reinstalls. +# if this base image changes, this version must be updated. +ENV SCRYPTED_BASE_VERSION=20230322 + ################################################################ # End section generated from template/Dockerfile.full.footer ################################################################ diff --git a/docker/Dockerfile.lite b/docker/Dockerfile.lite index dd51eb443..805d29b65 100644 --- a/docker/Dockerfile.lite +++ b/docker/Dockerfile.lite @@ -39,3 +39,7 @@ ENV SCRYPTED_DOCKER_SERVE="true" ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" + +# changing this forces pip and npm to perform reinstalls. +# if this base image changes, this version must be updated. +ENV SCRYPTED_BASE_VERSION=20230322 diff --git a/docker/Dockerfile.thin b/docker/Dockerfile.thin index 12e7542f2..eee96d533 100644 --- a/docker/Dockerfile.thin +++ b/docker/Dockerfile.thin @@ -18,3 +18,7 @@ ENV SCRYPTED_DOCKER_SERVE="true" ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" + +# changing this forces pip and npm to perform reinstalls. +# if this base image changes, this version must be updated. +ENV SCRYPTED_BASE_VERSION=20230322 diff --git a/docker/template/Dockerfile.full.footer b/docker/template/Dockerfile.full.footer index be2bc0da4..9c4f9ccb7 100644 --- a/docker/template/Dockerfile.full.footer +++ b/docker/template/Dockerfile.full.footer @@ -8,6 +8,10 @@ ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" +# changing this forces pip and npm to perform reinstalls. +# if this base image changes, this version must be updated. +ENV SCRYPTED_BASE_VERSION=20230322 + ################################################################ # End section generated from template/Dockerfile.full.footer ################################################################