1.0.2-amd64

Author: flyth

Dockerfile

@@ -1,7 +1,7 @@
-FROM sinusbot/docker:1.0.0-beta.16-ba60e37-discord
+FROM sinusbot/docker:1.0.2-amd64-discord
 
 LABEL description="SinusBot - TeamSpeak 3 and Discord music bot."
-LABEL version="1.0.0-beta.16-ba60e37"
+LABEL version="1.0.2-amd64"
 
 # Install dependencies and clean up afterwards
 RUN apt-get update && \

discord/Dockerfile

@@ -1,11 +1,11 @@
 FROM debian:buster-slim
 
 LABEL description="SinusBot - Discord only image"
-LABEL version="1.0.0-beta.16-ba60e37"
+LABEL version="1.0.2-amd64"
 
 # Install dependencies and clean up afterwards
 RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates bzip2 unzip curl python procps libpci3 libxslt1.1 libxkbcommon0 locales && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates bzip2 unzip curl python3 procps libpci3 libxslt1.1 libxkbcommon0 locales && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
 
 # Set locale
@@ -22,8 +22,8 @@ RUN chmod 755 install.sh
 # Download/Install SinusBot
 RUN bash install.sh sinusbot
 
-# Download/Install youtube-dl
-RUN bash install.sh youtube-dl
+# Download/Install yt-dlp
+RUN bash install.sh yt-dlp
 
 # Download/Install Text-to-Speech
 RUN bash install.sh text-to-speech

discord/entrypoint.sh

@@ -17,9 +17,9 @@ fi
 ln -fs data/config.ini config.ini
 
 SINUSBOT="./sinusbot"
-YTDL="youtube-dl"
+YTDL="yt-dlp"
 
-echo "Updating youtube-dl..."
+echo "Updating yt-dlp..."
 $YTDL --restrict-filename -U
 $YTDL --version
 
@@ -65,7 +65,7 @@ if [[ -v UID ]] || [[ -v GID ]]; then
   YTDL="$SETPRIV $YTDL"
 fi
 
-echo "Clearing youtube-dl cache..."
+echo "Clearing yt-dlp cache..."
 $YTDL --rm-cache-dir
 
 echo "Starting SinusBot..."

discord/install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-SINUSBOT_VERSION="1.0.0-beta.16-ba60e37"
+SINUSBOT_VERSION="1.0.2-amd64"
 
 case "$1" in
 
@@ -52,12 +52,12 @@ Instances = 2
 EOT
 	echo "Successfully installed Text-to-Speech"
 	;;
-"youtube-dl")
-	echo "Downloading youtube-dl..."
-	curl -s -L -o /usr/local/bin/youtube-dl https://yt-dl.org/downloads/latest/youtube-dl
-	chmod 755 /usr/local/bin/youtube-dl
-	echo 'YoutubeDLPath = "/usr/local/bin/youtube-dl"' >> config.ini.configured
-	echo "Successfully installed youtube-dl"
+"yt-dlp")
+	echo "Downloading yt-dlp..."
+	curl -s -L -o /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp
+	chmod 755 /usr/local/bin/yt-dlp
+	echo 'YoutubeDLPath = "/usr/local/bin/yt-dlp"' >> config.ini.configured
+	echo "Successfully installed yt-dlp"
 	;;
 "teamspeak")
 	echo "Installing TeamSpeak Client..."