Fixed docker build issues

.github/workflows/docker-pr.yml

@@ -1,42 +0,0 @@
-name: docker-pr
-
-on:
-  pull_request:
-    branches: [master]
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      - name: Set hash
-        id: vars
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - name: create-json
-        id: create-json
-        uses: jsdaniell/create-json@1.1.2
-        with:
-          name: "version.json"
-          json: '{"type": "docker", "tag": "nightly", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
-          dir: 'backend/'
-      - name: setup platform emulator
-        uses: docker/setup-qemu-action@v1
-      - name: setup multi-arch docker build
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: build & push images
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm,linux/arm64/v8
-          push: false
-          tags: tzahi12345/youtubedl-material:nightly-pr

Dockerfile

@@ -1,18 +1,17 @@
 FROM ubuntu:20.04 AS ffmpeg
 
-ENV DEBIAN_FRONTEND=noninteractive
-
+RUN apt-get update && apt-get -y install curl xz-utils 
 COPY docker-build.sh .
 RUN sh ./docker-build.sh
 
 FROM ubuntu:20.04 as frontend
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get -y install curl
+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 \
-  yarn
-RUN npm config set strict-ssl false
+RUN apt-get -y install nodejs
+
 RUN npm install -g @angular/cli
 
 WORKDIR /build
@@ -32,23 +31,16 @@ ENV UID=1000 \
   USER=youtube \
   NO_UPDATE_NOTIFIER=true
 
-ENV DEBIAN_FRONTEND=noninteractive
-
 RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
 
+RUN apt-get update && apt-get -y install curl
+
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get update && apt-get -y install \
   nodejs \
-  yarn \
   python2 \
   python3 \
-  atomicparsley && \
-  apt-get autoremove --purge && \
-  apt-get autoremove && \
-  apt-get clean && \
-  rm -rf /var/lib/apt
-
-RUN npm config set strict-ssl false
+  atomicparsley
 
 WORKDIR /app
 COPY --from=ffmpeg /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg

backend/subscriptions.js

@@ -141,7 +141,6 @@ async function unsubscribe(sub, deleteMode, user_uid = null) {
         if (sub.archive && (await fs.pathExists(sub.archive))) {
             const archive_file_path = path.join(sub.archive, 'archive.txt');
             // deletes archive if it exists
-            // TODO: Keep entries in blacklist_video.txt by moving them to a global blacklist
             if (await fs.pathExists(archive_file_path)) {
                 await fs.unlink(archive_file_path);
             }
@@ -380,11 +379,7 @@ async function generateArgsForSubscription(sub, user_uid, redownload = false, de
     if (useArchive && !redownload) {
         if (sub.archive) {
             archive_dir = sub.archive;
-            if (sub.type && sub.type === 'audio') {
-                archive_path = path.join(archive_dir, 'merged_audio.txt');
-            } else {
-                archive_path = path.join(archive_dir, 'merged_video.txt');
-            }            
+            archive_path = path.join(archive_dir, 'archive.txt')
         }
         downloadConfig.push('--download-archive', archive_path);
     }

docker-build.sh

@@ -4,6 +4,8 @@
 # and also optimizing some code with this commit.
 # xoxo :D
 
+# set -xeuo pipefail
+
 case $(uname -m) in
   x86_64)
     ARCH=amd64;;
@@ -20,24 +22,15 @@ case $(uname -m) in
     exit 1
 esac
 
-echo "(INFO) Architecture detected: $ARCH"
-echo "(1/5) READY - Acquire temp dependencies in ffmpeg obtain layer"
-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"
-curl -o ffmpeg.txz \
-    --connect-timeout 5 \
+echo "Architecture: $ARCH"
+curl --connect-timeout 5 \
     --max-time 10 \
     --retry 5 \
     --retry-delay 0 \
     --retry-max-time 40 \
-    "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-${ARCH}-static.tar.xz"
+    "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-${ARCH}-static.tar.xz" -o ffmpeg.txz
 mkdir /tmp/ffmpeg
 tar xf ffmpeg.txz -C /tmp/ffmpeg
-echo "(3/5) CLEANUP - Remove temp dependencies from ffmpeg obtain layer"
-apt-get -y remove curl xz-utils
-apt-get -y autoremove
-echo "(4/5) PROVISION - Provide ffmpeg and ffprobe from ffmpeg obtain layer"
 cp /tmp/ffmpeg/*/ffmpeg /usr/local/bin/ffmpeg
 cp /tmp/ffmpeg/*/ffprobe /usr/local/bin/ffprobe
-echo "(5/5) CLEANUP - Remove temporary downloads from ffmpeg obtain layer"
 rm -rf /tmp/ffmpeg ffmpeg.txz