From 785022a6718ca945f8e02b7d569b58a377a46af9 Mon Sep 17 00:00:00 2001 From: fithwum Date: Thu, 9 Nov 2023 08:17:13 -0800 Subject: [PATCH] updates --- alpine/Dockerfile | 2 +- alpine/files/Install_Script.sh | 9 +++++---- basic/Dockerfile | 2 +- basic/files/Install_Script.sh | 7 ++++--- build_base.sh | 9 +++++++++ debian/Dockerfile | 2 +- debian/files/Install_Script.sh | 9 +++++---- 7 files changed, 26 insertions(+), 14 deletions(-) create mode 100755 build_base.sh diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 334e16f..085b093 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:latest LABEL maintainer "fithwum" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/master/alpine/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/alpine/files/Install_Script.sh # Install dependencies and folder creation RUN apk update && apk add --no-cache ca-certificates libstdc++ su-exec bash-completion tar \ diff --git a/alpine/files/Install_Script.sh b/alpine/files/Install_Script.sh index a038ab1..bbe64c0 100644 --- a/alpine/files/Install_Script.sh +++ b/alpine/files/Install_Script.sh @@ -3,6 +3,7 @@ # 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." wget --no-cache https://www.teamspeak.com/versions/server.json -O /ts3temp/server.json @@ -44,7 +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 https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh + 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 fi @@ -54,7 +55,7 @@ if [ -e /ts3server/ts3db_mariadb.ini ] else echo " " echo "WARNING ! ts3db_mariadb.ini not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3db_mariadb.ini -O /ts3temp/inifiles/ts3db_mariadb.ini + 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 fi @@ -64,7 +65,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3server.ini -O /ts3temp/inifiles/ts3server.ini + wget --no-cache ${TS_FILES}/ts3server.ini -O /ts3temp/inifiles/ts3server.ini cp /ts3temp/inifiles/ts3server.ini /ts3server/ rm -fr /ts3temp/inifiles/ts3server.ini fi @@ -74,7 +75,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted + 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 fi diff --git a/basic/Dockerfile b/basic/Dockerfile index d940544..6c79f28 100644 --- a/basic/Dockerfile +++ b/basic/Dockerfile @@ -2,7 +2,7 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/master/basic/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/basic/files/Install_Script.sh # Install dependencies and folder creation RUN apt-get -y update && apt-get clean \ diff --git a/basic/files/Install_Script.sh b/basic/files/Install_Script.sh index 0f6d561..2c7653e 100644 --- a/basic/files/Install_Script.sh +++ b/basic/files/Install_Script.sh @@ -3,6 +3,7 @@ # All rights reserved # Variables. +TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files echo " " echo "Checking server version from Teamspeak." wget --no-cache https://www.teamspeak.com/versions/server.json -O /ts3temp/server.json @@ -44,7 +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 https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh + 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 fi @@ -54,7 +55,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/basic/files/ts3server.ini -O /ts3temp/inifiles/ts3server.ini + 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 fi @@ -64,7 +65,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted + 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 fi diff --git a/build_base.sh b/build_base.sh new file mode 100755 index 0000000..89062ac --- /dev/null +++ b/build_base.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Copyright (c) 2023 fithwum +# All rights reserved + +docker build --pull --rm -f "alpine/Dockerfile" -t fithwum/teamspeak-server:alpine "alpine" +sleep 5 +docker build --pull --rm -f "debian/Dockerfile" -t fithwum/teamspeak-server:debian "debian" +sleep 5 +docker build --pull --rm -f "basic/Dockerfile" -t fithwum/teamspeak-server:basic "basic" diff --git a/debian/Dockerfile b/debian/Dockerfile index f2c06cd..1844807 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -2,7 +2,7 @@ FROM fithwum/debian-base:bullseye LABEL maintainer "fithwum" # URL's for files -ARG INSTALL_SCRIPT=https://raw.githubusercontent.com/fithwum/teamspeak-server/master/debian/files/Install_Script.sh +ARG INSTALL_SCRIPT=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/debian/files/Install_Script.sh # Install dependencies and folder creation RUN apt-get -y update && apt-get clean \ diff --git a/debian/files/Install_Script.sh b/debian/files/Install_Script.sh index b823654..59562df 100644 --- a/debian/files/Install_Script.sh +++ b/debian/files/Install_Script.sh @@ -3,6 +3,7 @@ # All rights reserved # Variables. +TS_FILES=https://gitlab.fithwum.tech/fithwum/teamspeak-server/-/raw/main/files echo " " echo "Checking server version from Teamspeak." wget --no-cache https://www.teamspeak.com/versions/server.json -O /ts3temp/server.json @@ -44,7 +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 https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3server_minimal_runscript.sh -O /ts3temp/inifiles/ts3server_minimal_runscript.sh + 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 fi @@ -54,7 +55,7 @@ if [ -e /ts3server/ts3db_mariadb.ini ] else echo " " echo "WARNING ! ts3db_mariadb.ini not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3db_mariadb.ini -O /ts3temp/inifiles/ts3db_mariadb.ini + 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 fi @@ -64,7 +65,7 @@ if [ -e /ts3server/ts3server.ini ] else echo " " echo "WARNING ! ts3server.ini not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/ts3server.ini -O /ts3temp/inifiles/ts3server.ini + wget --no-cache ${TS_FILES}/ts3server.ini -O /ts3temp/inifiles/ts3server.ini cp /ts3temp/inifiles/ts3server.ini /ts3server/ rm -fr /ts3temp/inifiles/ts3server.ini fi @@ -74,7 +75,7 @@ if [ -e /ts3server/.ts3server_license_accepted ] else echo " " echo "WARNING ! .ts3server_license_accepted not found ... will download now." - wget --no-cache https://raw.githubusercontent.com/fithwum/teamspeak-server/master/files/.ts3server_license_accepted -O /ts3temp/.ts3server_license_accepted + 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 fi