From b44b4bbbb23d22db94ac83754e76ae6b1325692f Mon Sep 17 00:00:00 2001
From: Dnomd343 <i@343.re>
Date: Sun, 23 Apr 2023 11:24:49 +0800
Subject: [PATCH] build: alltube version `3.2.0-alpha`, using built-in `yt-dlp`

---
 Dockerfile | 12 ++++++------
 init.sh    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e7b2c8a..27faafc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@ 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.03.04"
+#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
 RUN apk add patch php-dom php-gmp php-xml php-intl php-gettext php-simplexml php-tokenizer php-xmlwriter
-ENV ALLTUBE="3.1.1"
+ENV ALLTUBE="3.2.0-alpha"
 RUN wget https://github.com/Rudloff/alltube/archive/${ALLTUBE}.tar.gz -O - | tar xzf -
 COPY --from=composer /composer.phar /usr/bin/composer
 WORKDIR ./alltube-${ALLTUBE}/
@@ -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 4ca15f1..827e773 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..."