diff --git a/Dockerfile b/Dockerfile index b3ee76c..cc05a7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,17 +14,17 @@ RUN apt-get update \ ## Set some variables for override. # Download Link of TS3 Server -ENV TEAMSPEAK_VERSION 3.0.11.4 -ENV TEAMSPEAK_SHA1 09e7fc2cb5dddf84f3356ddd555ad361f5854321 +ENV TEAMSPEAK_VERSION 3.0.12.3 +ENV TEAMSPEAK_SHA1 d74d60853e6fb41be74d2dc198e37ab776a164fa # Inject a Volume for any TS3-Data that needs to be persisted or to be accessible from the host. (e.g. for Backups) VOLUME ["/teamspeak3"] # Download TS3 file and extract it into /opt. -RUN wget -O teamspeak3-server_linux-amd64.tar.gz http://dl.4players.de/ts/releases/${TEAMSPEAK_VERSION}/teamspeak3-server_linux-amd64-${TEAMSPEAK_VERSION}.tar.gz \ - && echo "${TEAMSPEAK_SHA1} *teamspeak3-server_linux-amd64.tar.gz" | sha1sum -c - \ - && tar -C /opt -xzf teamspeak3-server_linux-amd64.tar.gz \ - && rm teamspeak3-server_linux-amd64.tar.gz +RUN wget -O teamspeak3-server_linux-amd64.tar.bz2 http://dl.4players.de/ts/releases/${TEAMSPEAK_VERSION}/teamspeak3-server_linux_amd64-${TEAMSPEAK_VERSION}.tar.bz2 \ + && echo "${TEAMSPEAK_SHA1} *teamspeak3-server_linux-amd64.tar.bz2" | sha1sum -c - \ + && tar -C /opt -xjf teamspeak3-server_linux-amd64.tar.bz2 \ + && rm teamspeak3-server_linux-amd64.tar.bz2 ADD /scripts/ /opt/scripts/ RUN chmod -R 774 /opt/scripts/ diff --git a/scripts/docker-ts3.sh b/scripts/docker-ts3.sh index d5158fe..325e064 100644 --- a/scripts/docker-ts3.sh +++ b/scripts/docker-ts3.sh @@ -3,13 +3,13 @@ VOLUME=/teamspeak3 echo " ----- docker-ts3 ------" echo "1. Linking host mounted database" -ln -s $VOLUME/ts3server.sqlitedb /opt/teamspeak3-server_linux-amd64/ts3server.sqlitedb +ln -s $VOLUME/ts3server.sqlitedb /opt/teamspeak3-server_linux_amd64/ts3server.sqlitedb echo "2. Link the files-folder into the host-mounted volume." mkdir -p /teamspeak3/files -if ! [ -L /opt/teamspeak3-server_linux-amd64/files ]; then - rm -rf /opt/teamspeak3-server_linux-amd64/files - ln -s /teamspeak3/files /opt/teamspeak3-server_linux-amd64/files +if ! [ -L /opt/teamspeak3-server_linux_amd64/files ]; then + rm -rf /opt/teamspeak3-server_linux_amd64/files + ln -s /teamspeak3/files /opt/teamspeak3-server_linux_amd64/files fi echo "3. Starting TS3-Server." @@ -22,11 +22,11 @@ if [ -f $VOLUME/ts3server.ini ]; then echo "logpath='/teamspeak3/logs/'" echo "licensepath='/teamspeak3/'" echo "inifile='/teamspeak3/ts3server.ini'" - /opt/teamspeak3-server_linux-amd64/ts3server_minimal_runscript.sh \ + /opt/teamspeak3-server_linux_amd64/ts3server_minimal_runscript.sh \ inifile="/teamspeak3/ts3server.ini" else echo "$VOLUME/ts3server.ini not found. Creating new config file." - /opt/teamspeak3-server_linux-amd64/ts3server_minimal_runscript.sh \ + /opt/teamspeak3-server_linux_amd64/ts3server_minimal_runscript.sh \ query_ip_whitelist="/teamspeak3/query_ip_whitelist.txt" \ query_ip_backlist="/teamspeak3/query_ip_blacklist.txt" \ logpath="/teamspeak3/logs/" \