From f8a0d149681cccb0bb35e779d838171027a22d34 Mon Sep 17 00:00:00 2001
From: Isaac Abadi <IsaacMGrynsztein@gmail.com>
Date: Sat, 30 Apr 2022 17:17:07 -0400
Subject: [PATCH] Updated Dockerfile to support ubuntu

---
 Dockerfile | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 19df50a..b892e81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,16 @@
 FROM ubuntu:focal AS ffmpeg
 
-COPY docker-build.sh .
-RUN sh ./docker-build.sh
+RUN apt-get update && apt-get install -y software-properties-common 
+RUN add-apt-repository ppa:savoury1/ffmpeg4
+RUN add-apt-repository ppa:savoury1/ffmpeg5 && apt-get update && apt-get install -y ffmpeg
 
 FROM ubuntu:focal as frontend
 
-RUN apt-get update && apt-get install npm
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update
+RUN apt-get -y install curl gnupg
+RUN curl -sL https://deb.nodesource.com/setup_12.x  | bash -
+RUN apt-get -y install nodejs
 
 RUN npm install -g @angular/cli
 
@@ -27,17 +32,20 @@ ENV UID=1000 \
 
 ENV NO_UPDATE_NOTIFIER=true
 
-RUN addgroup -S $USER -g $GID && adduser -D -S $USER -G $USER -u $UID
+RUN groupadd -g $GID $USER
+RUN useradd --system -g $USER --uid $UID $USER
 
-RUN apt-get update && apt-get install \
+ENV DEBIAN_FRONTEND=noninteractive
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get update && apt-get -y install \
   npm \
   python2 \
   python3 \
   atomicparsley
 
 WORKDIR /app
-COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
-COPY --from=ffmpeg /usr/local/bin/ffprobe /usr/local/bin/ffprobe 
+COPY --from=ffmpeg /usr/bin/ffmpeg /usr/bin/ffmpeg
+COPY --from=ffmpeg /usr/bin/ffprobe /usr/bin/ffprobe 
 COPY --chown=$UID:$GID [ "backend/package.json", "backend/package-lock.json", "/app/" ]
 ENV PM2_HOME=/app/pm2
 RUN npm install pm2 -g
@@ -47,5 +55,5 @@ COPY --chown=$UID:$GID --from=frontend [ "/build/backend/public/", "/app/public/
 COPY --chown=$UID:$GID [ "/backend/", "/app/" ]
 
 EXPOSE 17442
-ENTRYPOINT [ "/app/entrypoint.sh" ]
+# ENTRYPOINT [ "/app/entrypoint.sh" ]
 CMD [ "pm2-runtime", "pm2.config.js" ]