From f371f14de72a64e418ef9c13cb2d62be2d7ce808 Mon Sep 17 00:00:00 2001 From: Kieran Eglin Date: Wed, 1 May 2024 14:45:20 -0700 Subject: [PATCH] Added jq to docker deps --- dev.Dockerfile | 2 +- lib/pinchflat/lifecycle/user_scripts/command_runner.ex | 4 ++-- selfhosted.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index c6e6132..460543e 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -7,7 +7,7 @@ FROM ${DEV_IMAGE} # Install debian packages RUN apt-get update -qq -RUN apt-get install -y inotify-tools ffmpeg curl git openssh-client \ +RUN apt-get install -y inotify-tools ffmpeg curl git openssh-client jq \ python3 python3-pip python3-setuptools python3-wheel python3-dev locales procps # Install nodejs diff --git a/lib/pinchflat/lifecycle/user_scripts/command_runner.ex b/lib/pinchflat/lifecycle/user_scripts/command_runner.ex index a5e1d66..b346bbe 100644 --- a/lib/pinchflat/lifecycle/user_scripts/command_runner.ex +++ b/lib/pinchflat/lifecycle/user_scripts/command_runner.ex @@ -44,7 +44,7 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do executable_path, [to_string(event_type), encoded_data], [], - logging_arg_override: "[supressed]" + logging_arg_override: "[suppressed]" ) handle_output(output, exit_code) @@ -56,7 +56,7 @@ defmodule Pinchflat.Lifecycle.UserScripts.CommandRunner do end defp handle_output(output, exit_code) do - Logger.debug("Custom lifecycle script had an exit code of #{exit_code} output: #{output}") + Logger.debug("Custom lifecycle script exit code: #{exit_code} with output: #{output}") :ok end diff --git a/selfhosted.Dockerfile b/selfhosted.Dockerfile index fd3bd91..9a9d96b 100644 --- a/selfhosted.Dockerfile +++ b/selfhosted.Dockerfile @@ -79,7 +79,7 @@ ARG PORT=8945 RUN apt-get update -y RUN apt-get install -y libstdc++6 openssl libncurses5 locales ca-certificates \ - ffmpeg curl git openssh-client nano python3 python3-pip + ffmpeg curl git openssh-client nano python3 python3-pip jq procps RUN apt-get clean && rm -f /var/lib/apt/lists/*_* # Download and update YT-DLP