Compare commits

...

3 Commits

Author SHA1 Message Date
Isaac Abadi
d37287541f Reverted ubuntu version to 20.04 2022-05-05 21:37:02 -04:00
Glassed Silver
4d00960fcf Merge pull request #607 from Tzahi12345/fix-603
Startup crash hotfix
2022-05-05 16:06:58 +02:00
Tzahi12345
6e8ca9d843 Fixed bug that caused verifyBinaryExistsLinux to crash the server on startup 2022-05-05 09:27:56 -04:00
2 changed files with 9 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS ffmpeg
FROM ubuntu:20.04 AS ffmpeg
ENV DEBIAN_FRONTEND=noninteractive
@@ -7,17 +7,16 @@ RUN sh ./docker-build.sh
#--------------# Stage 2
FROM ubuntu:22.04 as frontend
FROM ubuntu:20.04 as frontend
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \
curl \
gnupg \
# Ubuntu 22.04 ships Node.JS 12 by default :)
curl && \
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
apt-get install -y gnupg \
nodejs \
# needed on 21.10 and before, maybe not on 22.04 YARN: brings along npm, solves dependency conflicts,
# spares us this spaghetti approach: https://stackoverflow.com/a/60547197
npm && \
yarn && \
apt-get install -f && \
npm config set strict-ssl false && \
npm install -g @angular/cli
@@ -32,7 +31,7 @@ RUN npm run build
#--------------# Final Stage
FROM ubuntu:22.04
FROM ubuntu:20.04
ENV UID=1000 \
GID=1000 \

View File

@@ -90,7 +90,7 @@ exports.updateYoutubeDL = async (latest_update_version) => {
exports.verifyBinaryExistsLinux = () => {
const details_json = fs.readJSONSync(CONSTS.DETAILS_BIN_PATH);
if (!is_windows && details_json && details_json['path'].includes('.exe')) {
if (!is_windows && details_json && details_json['path'] && details_json['path'].includes('.exe')) {
details_json['path'] = 'node_modules/youtube-dl/bin/youtube-dl';
details_json['exec'] = 'youtube-dl';
details_json['version'] = OUTDATED_VERSION;