From 4535e9f50f40366f05109ea25e178fef0ee251ac Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 21 Mar 2024 13:53:34 -0700 Subject: [PATCH] docker: fixup build checks --- install/docker/Dockerfile.full | 4 ++-- install/docker/Dockerfile.lite | 7 +++---- install/docker/template/Dockerfile.full.footer | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index 55aacc9fe..0f77f23bf 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -99,9 +99,9 @@ ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" -RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python" && test -f "/usr/bin/python3.9" && test -f "/usr/bin/python3.10" +RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python3" && test -f "/usr/bin/python3.9" && test -f "/usr/bin/python3.10" ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg" -ENV SCRYPTED_PYTHON_PATH="/usr/bin/python" +ENV SCRYPTED_PYTHON_PATH="/usr/bin/python3" ENV SCRYPTED_PYTHON39_PATH="/usr/bin/python3.9" ENV SCRYPTED_PYTHON310_PATH="/usr/bin/python3.10" diff --git a/install/docker/Dockerfile.lite b/install/docker/Dockerfile.lite index 02db43739..9aa3ad123 100644 --- a/install/docker/Dockerfile.lite +++ b/install/docker/Dockerfile.lite @@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive # base tools and development stuff RUN apt-get update && apt-get -y install \ curl software-properties-common apt-utils \ - ffmpeg && \ + python3 && \ apt-get -y update && \ apt-get -y upgrade @@ -25,9 +25,8 @@ ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" -RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python" && test -f "/usr/bin/python3.10" -ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg" -ENV SCRYPTED_PYTHON_PATH="/usr/bin/python" +RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python3" && test -f "/usr/bin/python3.10" +ENV SCRYPTED_PYTHON_PATH="/usr/bin/python3" ENV SCRYPTED_PYTHON310_PATH="/usr/bin/python3.10" ENV SCRYPTED_DOCKER_FLAVOR="lite" diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer index 83b0a2fae..865f9f91f 100644 --- a/install/docker/template/Dockerfile.full.footer +++ b/install/docker/template/Dockerfile.full.footer @@ -31,9 +31,9 @@ ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" ENV SCRYPTED_INSTALL_PATH="/server" -RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python" && test -f "/usr/bin/python3.9" && test -f "/usr/bin/python3.10" +RUN test -f "/usr/bin/ffmpeg" && test -f "/usr/bin/python3" && test -f "/usr/bin/python3.9" && test -f "/usr/bin/python3.10" ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg" -ENV SCRYPTED_PYTHON_PATH="/usr/bin/python" +ENV SCRYPTED_PYTHON_PATH="/usr/bin/python3" ENV SCRYPTED_PYTHON39_PATH="/usr/bin/python3.9" ENV SCRYPTED_PYTHON310_PATH="/usr/bin/python3.10"