From 37263f84829f98fb355960e60e42480319985f63 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Thu, 5 Nov 2015 04:03:59 +0100 Subject: [PATCH] Update TS3Bot to https://github.com/icedream/ts3bot-control/commit/003ec4876352cf70f471d286543a88a3210df7a3. Change installation process by using the global binary that TS3Bot now ships. --- Dockerfile | 4 ++-- setup.sh | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ad2126..e47657e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:4.2 ENV TS3CLIENT_VERSION 3.0.18.2 -ENV TS3BOT_COMMIT b71c2be88ff76445d2859047dfbdd5c117e74523 +ENV TS3BOT_COMMIT 003ec4876352cf70f471d286543a88a3210df7a3 # Add "app" user RUN mkdir -p /tmp/empty &&\ @@ -18,4 +18,4 @@ COPY etc/ /etc # Startup configuration WORKDIR /home/app USER app -CMD [ "node", "/home/app/ts3bot", "--ts3-install-path=/home/app/ts3client" ] +CMD [ "ts3bot", "--ts3-install-path=/home/app/ts3client" ] diff --git a/setup.sh b/setup.sh index b1d2093..7f09c78 100644 --- a/setup.sh +++ b/setup.sh @@ -30,17 +30,9 @@ sed -i 's/^MS_PrintLicense$/#MS_PrintLicense/g' ./ts3client.run ./ts3client.run --quiet --target ts3client rm ./ts3client.run -# Install TS3Bot -wget https://github.com/icedream/ts3bot-control/archive/${TS3BOT_COMMIT}.tar.gz -O- |\ - tar xzv -mv ts3bot-control* ts3bot -(cd ts3bot && \ - npm_config_wcjs_runtime="node" npm_config_wcjs_runtime_version="$(node --version | tr -d 'v')" \ - npm install) - -# Install youtube-dl (actually done by npm already in a non-system-wide way) -#ADD https://yt-dl.org/latest/youtube-dl /usr/local/bin/youtube-dl -#RUN chmod a+rx /usr/local/bin/youtube-dl +# Install TS3Bot via Git +npm_config_wcjs_runtime="node" npm_config_wcjs_runtime_version="$(node --version | tr -d 'v')" \ + npm install -g "https://github.com/icedream/ts3bot-control#${TS3BOT_COMMIT}" # Clean up APT apt-get autoremove -y --purge wget cmake cmake-data