From fc3c179f6a7ae75554d51a15504f14cc389f3dd3 Mon Sep 17 00:00:00 2001 From: Tzahi12345 Date: Mon, 4 Jul 2022 20:45:39 -0400 Subject: [PATCH] Reverted #696 and updated node version to avoid 243 error --- Dockerfile | 5 +++-- backend/entrypoint.sh | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27ae8d5..e8be307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY ffmpeg-fetch.sh . RUN sh ./ffmpeg-fetch.sh -# Create our Ubuntu 22.04 with node 16 +# Create our Ubuntu 22.04 with node 16.14.2 (that specific version is required as per: https://stackoverflow.com/a/72855258/8088021) # Go to 20.04 FROM ubuntu:20.04 AS base ARG DEBIAN_FRONTEND=noninteractive @@ -21,7 +21,8 @@ RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \ apt install -y --no-install-recommends curl ca-certificates tzdata && \ curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ apt install -y --no-install-recommends nodejs && \ - npm -g install npm && \ + npm -g install npm n && \ + n 16.14.2 && \ apt clean && \ rm -rf /var/lib/apt/lists/* diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh index ec839b5..8be147f 100755 --- a/backend/entrypoint.sh +++ b/backend/entrypoint.sh @@ -11,8 +11,6 @@ fi # chown current working directory to current user if [ "$*" = "$CMD" ] && [ "$(id -u)" = "0" ]; then find . \! -user "$UID" -exec chown "$UID:$GID" -R '{}' + || echo "WARNING! Could not change directory ownership. If you manage permissions externally this is fine, otherwise you may experience issues when downloading or deleting videos." - usermod -u "$UID" "$USER" - groupmod -g "$GID" "$USER" exec gosu "$UID:$GID" "$0" "$@" fi