Merge branch 'master' of https://github.com/Tzahi12345/YoutubeDL-Material into notifications-update

pull/809/head
Tzahi12345 3 years ago
commit b911552c31

@ -3,10 +3,11 @@ FROM ubuntu:22.04 AS ffmpeg
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Use script due local build compability # Use script due local build compability
COPY ffmpeg-fetch.sh . COPY ffmpeg-fetch.sh .
RUN chmod +x ffmpeg-fetch.sh
RUN sh ./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 # Go to 20.04
FROM ubuntu:20.04 AS base FROM ubuntu:20.04 AS base
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -21,7 +22,8 @@ RUN groupadd -g $GID $USER && useradd --system -m -g $USER --uid $UID $USER && \
apt install -y --no-install-recommends curl ca-certificates tzdata && \ apt install -y --no-install-recommends curl ca-certificates tzdata && \
curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
apt install -y --no-install-recommends nodejs && \ apt install -y --no-install-recommends nodejs && \
npm -g install npm && \ npm -g install npm n && \
n 16.14.2 && \
apt clean && \ apt clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

@ -26,7 +26,7 @@ apt-get update && apt-get -y install curl xz-utils
echo "(2/5) DOWNLOAD - Acquire latest ffmpeg and ffprobe from John van Sickle's master-sourced builds in ffmpeg obtain layer" echo "(2/5) DOWNLOAD - Acquire latest ffmpeg and ffprobe from John van Sickle's master-sourced builds in ffmpeg obtain layer"
curl -o ffmpeg.txz \ curl -o ffmpeg.txz \
--connect-timeout 5 \ --connect-timeout 5 \
--max-time 10 \ --max-time 120 \
--retry 5 \ --retry 5 \
--retry-delay 0 \ --retry-delay 0 \
--retry-max-time 40 \ --retry-max-time 40 \

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save