diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 25f9e02..e081be7 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -6,7 +6,7 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/ma # Install dependencies and folder creation RUN apk update && apk add --no-cache ca-certificates libstdc++ su-exec bash-completion tar curl jq \ - && mkdir -p /ts3server /ts3temp /ts3temp/inifiles /ts3temp/serverfiles \ + && mkdir -p /ts3server /ts3temp /ts3temp/serverfiles \ && chmod 777 -R /ts3server /ts3temp \ && chown 99:100 -R /ts3server /ts3temp ADD "${INSTALL_SCRIPT}" /ts3temp diff --git a/alpine/files/Install_Script.sh b/alpine/files/Install_Script.sh index 8c24942..585878c 100644 --- a/alpine/files/Install_Script.sh +++ b/alpine/files/Install_Script.sh @@ -3,18 +3,20 @@ # All rights reserved # Variables. -TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files echo " " echo "Checking for new server version from Teamspeak." TS_VERSION=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq --raw-output '.linux.x86.version') -CHANGELOG=/ts3server/CHANGELOG_${TS_VERSION} +CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION echo "Latest server version from Teamspeak:$TS_VERSION" +TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files +TS_SERVER=https://files.teamspeak-services.com/releases/server/$TS_VERSION/teamspeak3-server_linux_amd64-$TS_VERSION.tar.bz2 + # Main install (alpine). # Check for files in /ts3server and download/create if needed. -if [ -e "${CHANGELOG}" ] +if [ -e "$CHANGELOG" ] then - echo "INFO ! Teamspeak server is ${TS_VERSION} ... checking that needed files exist before running current server." + echo "INFO ! Teamspeak server is $TS_VERSION ... checking that needed files exist before running current server." rm -fr /ts3temp/server.json else echo " " @@ -23,15 +25,15 @@ if [ -e "${CHANGELOG}" ] echo "INFO ! Cleaning outdated Teamspeak server files and downloading server update." rm -f /ts3server/CHANGELOG* /ts3server/lib* /ts3server/ts3server rm -fr /ts3server/doc /ts3server/redist /ts3server/serverquerydocs /ts3server/tsdns - wget --no-cache https://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_alpine-${TS_VERSION}.tar.bz2 -O /ts3temp/ts3server_${TS_VERSION}.tar.bz2 - tar -xf /ts3temp/ts3server_${TS_VERSION}.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_SERVER -O /ts3temp/ts3server_$TS_VERSION.tar.bz2 + tar -xf /ts3temp/ts3server_$TS_VERSION.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 sleep 1 rm -fr /ts3temp/serverfiles/ts3server_startscript.sh - rm -fr /ts3temp/ts3server_${TS_VERSION}.tar.bz2 + rm -fr /ts3temp/ts3server_$TS_VERSION.tar.bz2 cp -uR /ts3temp/serverfiles/. /ts3server/ sleep 1 mv /ts3server/redist/libmariadb.so.2 /ts3server/libmariadb.so.2 - mv /ts3server/CHANGELOG ${CHANGELOG} + mv /ts3server/CHANGELOG $CHANGELOG rm -fr /ts3temp/serverfiles/* rm -fr /ts3temp/server.json fi @@ -43,9 +45,7 @@ if [ -e /ts3server/ts3server_minimal_runscript.sh ] else echo " " echo "WARNING ! ts3server_minimal_runscript.sh not found ... will download now." - wget --no-cache ${TS_FILES}/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh - cp /ts3temp/inifiles/ts3server_minimal_runscript.sh /ts3server/ - rm -fr /ts3temp/ts3server_minimal_runscript.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3server_minimal_runscript.sh -O /ts3server/ts3server_minimal_runscript.sh fi if [ -e /ts3server/ts3db_mariadb.ini ] then @@ -53,9 +53,7 @@ if [ -e /ts3server/ts3db_mariadb.ini ] else echo " " echo "WARNING ! ts3db_mariadb.ini not found ... will download now." - wget --no-cache ${TS_FILES}/ts3db_mariadb.ini -O /ts3temp/inifiles/ts3db_mariadb.ini - cp /ts3temp/inifiles/ts3db_mariadb.ini /ts3server/ - rm -fr /ts3temp/inifiles/ts3db_mariadb.ini + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3db_mariadb.ini -O /ts3server/ts3db_mariadb.ini fi if [ -e /ts3server/ts3server.ini ] then @@ -63,9 +61,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache ${TS_FILES}/ts3server.ini -O /ts3temp/inifiles/ts3server.ini - cp /ts3temp/inifiles/ts3server.ini /ts3server/ - rm -fr /ts3temp/inifiles/ts3server.ini + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3server.ini -O /ts3server/ts3server.ini fi if [ -e /ts3server/.ts3server_license_accepted ] then @@ -73,9 +69,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache ${TS_FILES}/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted - cp /ts3temp/.ts3server_license_accepted /ts3server/ - rm -fr /ts3temp/.ts3server_license_accepted + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/.ts3server_license_accepted -O /ts3server/.ts3server_license_accepted fi sleep 1 @@ -88,7 +82,7 @@ chmod +x /ts3server/ts3server # Run. echo " " -echo "INFO ! Starting Teanspeak server ${TS_VERSION}" +echo "INFO ! Starting Teanspeak server $TS_VERSION." exec /ts3server/ts3server_minimal_runscript.sh inifile=ts3server.ini -exit +exit \ No newline at end of file diff --git a/basic/Dockerfile b/basic/Dockerfile index 7d2b057..0e3b5f0 100644 --- a/basic/Dockerfile +++ b/basic/Dockerfile @@ -8,7 +8,7 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/ma RUN apt-get -y update && apt-get clean \ && apt-get install -y ca-certificates curl jq \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /ts3server /ts3temp /ts3temp/inifiles /ts3temp/serverfiles \ + && mkdir -p /ts3server /ts3temp /ts3temp/serverfiles \ && chmod 777 -R /ts3server /ts3temp \ && chown 99:100 -R /ts3server /ts3temp ADD "${INSTALL_SCRIPT}" /ts3temp diff --git a/basic/files/Install_Script.sh b/basic/files/Install_Script.sh index d21a872..b2dad96 100644 --- a/basic/files/Install_Script.sh +++ b/basic/files/Install_Script.sh @@ -3,18 +3,20 @@ # All rights reserved # Variables. -TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files echo " " echo "Checking server version from Teamspeak." TS_VERSION=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq --raw-output '.linux.x86.version') -CHANGELOG=/ts3server/CHANGELOG_${TS_VERSION} -echo "Latest server version from Teamspeak:$TS_VERSION" +CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION +echo "Latest server version from Teamspeak:$TS_VERSION." + +TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files +TS_SERVER=https://files.teamspeak-services.com/releases/server/$TS_VERSION/teamspeak3-server_linux_amd64-$TS_VERSION.tar.bz2 # Main install (alpine). # Check for files in /ts3server and download/create if needed. -if [ -e "${CHANGELOG}" ] +if [ -e "$CHANGELOG" ] then - echo "INFO ! Teamspeak server is ${TS_VERSION} ... checking that needed files exist before running current server." + echo "INFO ! Teamspeak server is $TS_VERSION ... checking that needed files exist before running current server." rm -fr /ts3temp/server.json else echo " " @@ -23,15 +25,15 @@ if [ -e "${CHANGELOG}" ] echo "INFO ! Clearing old Teamspeak server files and downloading server update." rm -f /ts3server/CHANGELOG* /ts3server/lib* /ts3server/ts3server rm -fr /ts3server/doc /ts3server/redist /ts3server/serverquerydocs /ts3server/tsdns - wget --no-cache https://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 -O /ts3temp/ts3server_${TS_VERSION}.tar.bz2 - tar -xf /ts3temp/ts3server_${TS_VERSION}.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_SERVER -O /ts3temp/ts3server_$TS_VERSION.tar.bz2 + tar -xf /ts3temp/ts3server_$TS_VERSION.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 sleep 1 rm -fr /ts3temp/serverfiles/ts3server_startscript.sh - rm -fr /ts3temp/ts3server_${TS_VERSION}.tar.bz2 + rm -fr /ts3temp/ts3server_$TS_VERSION.tar.bz2 cp -uR /ts3temp/serverfiles/. /ts3server/ sleep 1 mv /ts3server/redist/libmariadb.so.2 /ts3server/libmariadb.so.2 - mv /ts3server/CHANGELOG ${CHANGELOG} + mv /ts3server/CHANGELOG $CHANGELOG rm -fr /ts3temp/serverfiles/* rm -fr /ts3temp/server.json fi @@ -43,9 +45,7 @@ if [ -e /ts3server/ts3server_minimal_runscript.sh ] else echo " " echo "WARNING ! ts3server_minimal_runscript.sh not found ... will download now." - wget --no-cache ${TS_FILES}/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh - cp /ts3temp/inifiles/ts3server_minimal_runscript.sh /ts3server/ - rm -fr /ts3temp/ts3server_minimal_runscript.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3server_minimal_runscript.sh -O /ts3server/ts3server_minimal_runscript.sh fi if [ -e /ts3server/ts3server.ini ] then @@ -53,9 +53,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/basic/files/ts3server.ini -O /ts3temp/inifiles/ts3server.ini - cp /ts3temp/inifiles/ts3server.ini /ts3server/ - rm -fr /ts3temp/inifiles/ts3server.ini + wget --no-cache --show-progress --progress=bar:force:noscroll https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/basic/files/ts3server.ini -O /ts3server/ts3server.ini fi if [ -e /ts3server/.ts3server_license_accepted ] then @@ -63,9 +61,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache ${TS_FILES}/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted - cp /ts3temp/.ts3server_license_accepted /ts3server/ - rm -fr /ts3temp/.ts3server_license_accepted + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/.ts3server_license_accepted -O /ts3server/.ts3server_license_accepted fi sleep 1 @@ -78,7 +74,7 @@ chmod +x /ts3server/ts3server # Run. echo " " -echo "INFO ! Starting Teamspeak server ${TS_VERSION}" +echo "INFO ! Starting Teamspeak server $TS_VERSION." exec /ts3server/ts3server_minimal_runscript.sh inifile=ts3server.ini -exit +exit \ No newline at end of file diff --git a/debian/Dockerfile b/debian/Dockerfile index a09a5cb..d4d5e8f 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -8,7 +8,7 @@ ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/ma RUN apt-get -y update && apt-get clean \ && apt-get install -y ca-certificates curl jq \ && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /ts3server /ts3temp /ts3temp/inifiles /ts3temp/serverfiles \ + && mkdir -p /ts3server /ts3temp /ts3temp/serverfiles \ && chmod 777 -R /ts3server /ts3temp \ && chown 99:100 -R /ts3server /ts3temp ADD "${INSTALL_SCRIPT}" /ts3temp diff --git a/debian/files/Install_Script.sh b/debian/files/Install_Script.sh index 51a94c5..8c94e00 100644 --- a/debian/files/Install_Script.sh +++ b/debian/files/Install_Script.sh @@ -3,18 +3,20 @@ # All rights reserved # Variables. -TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files echo " " echo "Checking server version from Teamspeak." TS_VERSION=$(curl -s "https://www.teamspeak.com/versions/server.json" | jq --raw-output '.linux.x86.version') -CHANGELOG=/ts3server/CHANGELOG_${TS_VERSION} -echo "Latest server version from Teamspeak:$TS_VERSION" +CHANGELOG=/ts3server/CHANGELOG_$TS_VERSION +echo "Latest server version from Teamspeak:$TS_VERSION." + +TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files +TS_SERVER=https://files.teamspeak-services.com/releases/server/$TS_VERSION/teamspeak3-server_linux_amd64-$TS_VERSION.tar.bz2 # Main install (debian). # Check for files in /ts3server and download/create if needed. -if [ -e "${CHANGELOG}" ] +if [ -e "$CHANGELOG" ] then - echo "INFO ! Teamspeak server is ${TS_VERSION} ... checking that needed files exist before running current server." + echo "INFO ! Teamspeak server is $TS_VERSION ... checking that needed files exist before running current server." rm -fr /ts3temp/server.json else echo " " @@ -23,15 +25,15 @@ if [ -e "${CHANGELOG}" ] echo "INFO ! Clearing old Teamspeak server files and downloading server update." rm -f /ts3server/CHANGELOG* /ts3server/lib* /ts3server/ts3server rm -fr /ts3server/doc /ts3server/redist /ts3server/serverquerydocs /ts3server/tsdns - wget --no-cache https://files.teamspeak-services.com/releases/server/${TS_VERSION}/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 -O /ts3temp/ts3server_${TS_VERSION}.tar.bz2 - tar -xf /ts3temp/ts3server_${TS_VERSION}.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_SERVER -O /ts3temp/ts3server_$TS_VERSION.tar.bz2 + tar -xf /ts3temp/ts3server_$TS_VERSION.tar.bz2 -C /ts3temp/serverfiles --strip-components=1 sleep 1 rm -fr /ts3temp/serverfiles/ts3server_startscript.sh - rm -fr /ts3temp/ts3server_${TS_VERSION}.tar.bz2 + rm -fr /ts3temp/ts3server_$TS_VERSION.tar.bz2 cp -uR /ts3temp/serverfiles/. /ts3server/ sleep 1 mv /ts3server/redist/libmariadb.so.2 /ts3server/libmariadb.so.2 - mv /ts3server/CHANGELOG ${CHANGELOG} + mv /ts3server/CHANGELOG $CHANGELOG rm -fr /ts3temp/serverfiles/* rm -fr /ts3temp/server.json fi @@ -43,9 +45,7 @@ if [ -e /ts3server/ts3server_minimal_runscript.sh ] else echo " " echo "WARNING ! ts3server_minimal_runscript.sh not found ... will download now." - wget --no-cache ${TS_FILES}/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh - cp /ts3temp/inifiles/ts3server_minimal_runscript.sh /ts3server/ - rm -fr /ts3temp/ts3server_minimal_runscript.sh + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3server_minimal_runscript.sh -O /ts3server/ts3server_minimal_runscript.sh fi if [ -e /ts3server/ts3db_mariadb.ini ] then @@ -53,9 +53,7 @@ if [ -e /ts3server/ts3db_mariadb.ini ] else echo " " echo "WARNING ! ts3db_mariadb.ini not found ... will download now." - wget --no-cache ${TS_FILES}/ts3db_mariadb.ini -O /ts3temp/inifiles/ts3db_mariadb.ini - cp /ts3temp/inifiles/ts3db_mariadb.ini /ts3server/ - rm -fr /ts3temp/inifiles/ts3db_mariadb.ini + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3db_mariadb.ini -O /ts3server/ts3db_mariadb.ini fi if [ -e /ts3server/ts3server.ini ] then @@ -63,9 +61,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache ${TS_FILES}/ts3server.ini -O /ts3temp/inifiles/ts3server.ini - cp /ts3temp/inifiles/ts3server.ini /ts3server/ - rm -fr /ts3temp/inifiles/ts3server.ini + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/ts3server.ini -O /ts3server/ts3server.ini fi if [ -e /ts3server/.ts3server_license_accepted ] then @@ -73,9 +69,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache ${TS_FILES}/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted - cp /ts3temp/.ts3server_license_accepted /ts3server/ - rm -fr /ts3temp/.ts3server_license_accepted + wget --no-cache --show-progress --progress=bar:force:noscroll $TS_FILES/.ts3server_license_accepted -O /ts3server/.ts3server_license_accepted fi sleep 1 @@ -88,7 +82,7 @@ chmod +x /ts3server/ts3server # Run teamspeak server. echo " " -echo "INFO ! Starting Teamspeak server ${TS_VERSION}" +echo "INFO ! Starting Teamspeak server $TS_VERSION." exec /ts3server/ts3server_minimal_runscript.sh inifile=ts3server.ini -exit +exit \ No newline at end of file