Merge pull request #1 from tsaridas/development

Development

.github/workflows/ghcr-publish.yml

@@ -3,7 +3,7 @@ name: ghcr-publish
 on:
   push:
     branches:
-      - main
+      - development
 
 env:
   TMP_LOCAL_IMAGE: localhost:5000/${{ github.repository }}

Dockerfile

@@ -2,7 +2,7 @@
 FROM node:18-alpine3.18 AS base
 
 WORKDIR /srv/
-RUN apk add --no-cache git curl
+RUN apk add --no-cache git
 
 #########################################################################
 
@@ -16,7 +16,9 @@ ARG BRANCH=development
 RUN REPO="https://github.com/Stremio/stremio-web.git"; if [ "$BRANCH" == "release" ];then git clone "$REPO" --depth 1 --branch $(git ls-remote --tags --refs $REPO | tail -n1 | cut -d/ -f3); else git clone --depth 1 --branch "$BRANCH" https://github.com/Stremio/stremio-web.git; fi
 
 WORKDIR /srv/stremio-web
-RUN npm ci --no-audit --no-fund
+# Workaround to run it twice since if it fails because of timeout issues when building container in github
+# npm ERR! code ECONNRESET
+RUN npm ci --no-audit --no-fund || npm ci
 RUN npm run build
 
 RUN wget $(wget -O- https://raw.githubusercontent.com/Stremio/stremio-shell/master/server-url.txt)
@@ -106,6 +108,8 @@ RUN cd && \
   libbluray-dev \
   libdrm-dev \
   zimg-dev \
+  aom-dev \
+  xvidcore-dev \
   git \
   x264 && \
   DIR=$(mktemp -d) && \
@@ -115,13 +119,13 @@ RUN cd && \
   PATH="$BIN:$PATH" && \
   ./configure --help && \
   ./configure --bindir="$BIN" --disable-debug \
-  --prefix=/usr/lib/jellyfin-ffmpeg --extra-version=Jellyfin --disable-doc --disable-ffplay --disable-shared --disable-libxcb --disable-sdl2 --disable-xlib --enable-lto --enable-gpl --enable-version3 --enable-static --enable-gmp --enable-gnutls --enable-libdrm --enable-libass --enable-libfreetype --enable-libfribidi --enable-libfontconfig --enable-libbluray --enable-libmp3lame --enable-libopus --enable-libtheora --enable-libvorbis --enable-libdav1d --enable-libwebp --enable-libvpx --enable-libx264 --enable-libx265  --enable-libzimg --enable-small --enable-nonfree --toolchain=hardened && \
+  --prefix=/usr/lib/jellyfin-ffmpeg --extra-version=Jellyfin --disable-doc --disable-ffplay --disable-shared --disable-libxcb --disable-sdl2 --disable-xlib --enable-lto --enable-gpl --enable-version3 --enable-gmp --enable-gnutls --enable-libdrm --enable-libass --enable-libfreetype --enable-libfribidi --enable-libfontconfig --enable-libbluray --enable-libmp3lame --enable-libopus --enable-libtheora --enable-libvorbis --enable-libdav1d --enable-libwebp --enable-libvpx --enable-libx264 --enable-libx265  --enable-libzimg --enable-small --enable-nonfree --enable-libxvid --enable-libaom --toolchain=hardened && \
   make -j4 && \
   make install && \
   make distclean && \
   rm -rf "${DIR}"  && \
   apk del --purge .build-dependencies && \
-  apk add --no-cache libwebp libvorbis x265-libs x264-libs libass opus libgmpxx lame-libs gnutls libvpx libtheora libdrm libbluray zimg libdav1d && \
+  apk add --no-cache libwebp libvorbis x265-libs x264-libs libass opus libgmpxx lame-libs gnutls libvpx libtheora libdrm libbluray zimg libdav1d aom-libs xvidcore curl && \
   rm -rf /var/cache/apk/* && rm -rf /tmp/*
 
 #--------------------------