diff --git a/Dockerfile b/Dockerfile index 27faafc..143969f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,10 @@ FROM ${ALPINE} AS composer RUN apk add php-json php-phar php-mbstring php-openssl RUN wget https://install.phpcomposer.com/installer -O - | php -#FROM ${ALPINE} AS yt-dlp -#ENV YTDLP="2023.03.04" -#RUN wget https://github.com/yt-dlp/yt-dlp/releases/download/${YTDLP}/yt-dlp -#RUN chmod +x yt-dlp +FROM ${ALPINE} AS yt-dlp +ENV YTDLP="2023.06.22" +RUN wget https://github.com/yt-dlp/yt-dlp/releases/download/${YTDLP}/yt-dlp +RUN chmod +x yt-dlp FROM ${ALPINE} AS alltube RUN apk add php-json php-phar php-mbstring php-openssl @@ -33,7 +33,7 @@ RUN ln -s /usr/bin/python3 /release/usr/bin/python WORKDIR /release/etc/php7/php-fpm.d/ RUN sed 's?127.0.0.1:9000?/run/php-fpm.sock?' /etc/php7/php-fpm.d/www.conf > www.conf COPY --from=alltube /alltube/ /release/var/www/alltube/ -#COPY --from=yt-dlp /yt-dlp /release/usr/bin/ +COPY --from=yt-dlp /yt-dlp /release/usr/bin/ COPY ./init.sh /release/usr/bin/alltube COPY ./nginx/ /release/etc/nginx/ diff --git a/init.sh b/init.sh index 827e773..4ca15f1 100755 --- a/init.sh +++ b/init.sh @@ -6,7 +6,7 @@ NGINX_CONFIG="/etc/nginx/alltube.conf" CONFIG="/var/www/alltube/config/config.yml" sed -i "s,^audioBitrate:.*,audioBitrate: 320," "${CONFIG}" -#sed -i "s,^youtubedl:.*,youtubedl: /usr/bin/yt-dlp," "${CONFIG}" +sed -i "s,^youtubedl:.*,youtubedl: /usr/bin/yt-dlp," "${CONFIG}" if [ -n "${PORT}" ]; then echo "Port: ${PORT}" @@ -36,7 +36,7 @@ if [ -n "${TITLE}" ]; then sed -i "s,^appName:.*,appName: ${TITLE}," "${CONFIG}" fi -#echo "yt-dlp version: $(yt-dlp --version)" +echo "yt-dlp version: $(yt-dlp --version)" echo "Alltube service is running..."