mirror of
https://github.com/Tzahi12345/YoutubeDL-Material.git
synced 2026-04-22 15:03:19 +03:00
Merge pull request #584 from GlassedSilver/master
wow that was a bunch of work, but...
This commit is contained in:
12
Dockerfile
12
Dockerfile
@@ -13,7 +13,10 @@ RUN apt-get update && apt-get -y install \
|
|||||||
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
|
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
nodejs \
|
nodejs \
|
||||||
npm && \
|
# YARN: brings along npm, solves dependency conflicts,
|
||||||
|
# spares us this spaghetti approach: https://stackoverflow.com/a/60547197
|
||||||
|
yarn && \
|
||||||
|
apt-get install -f && \
|
||||||
npm install -g @angular/cli
|
npm install -g @angular/cli
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
@@ -35,12 +38,13 @@ ENV UID=1000 \
|
|||||||
|
|
||||||
RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
|
RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
|
||||||
|
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
|
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
|
||||||
apt-get update && apt-get -y install \
|
RUN apt-get update && apt-get -y install \
|
||||||
npm \
|
npm \
|
||||||
python2 \
|
python2 \
|
||||||
python3 \
|
python3 \
|
||||||
atomicparsley
|
atomicparsley && \
|
||||||
|
apt-get install -f
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
|
COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
|
||||||
|
|||||||
Reference in New Issue
Block a user