diff --git a/Dockerfile b/Dockerfile index 834b791..7d4ef88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM multiarch/debian-debootstrap:i386-jessie +FROM i386/ubuntu:latest MAINTAINER sairuk battlelore chocotaco # ENVIRONMENT @@ -23,7 +23,7 @@ sudo unzip \ # -- logging rsyslog \ # -- utilities -sed less vim file nano \ +sed less vim file nano wget \ # --- wine ${WINEVER} \ # -- display @@ -36,9 +36,8 @@ git-core RUN apt-get -y clean && apt-get -y autoremove -# ENV # -- shutup installers -ENV DEBIAN_FRONTEND noninteractive +ARG DEBIAN_FRONTEND=noninteractive # USER diff --git a/_scripts/start-server b/_scripts/start-server index bbbb445..0f40ae1 100755 --- a/_scripts/start-server +++ b/_scripts/start-server @@ -7,5 +7,5 @@ find ${BASEDIR} -name \*.dso -execdir /bin/rm {} \; cd $WINEPREFIX/drive_c/Dynamix/Tribes2/GameData -xvfb-run -a -w 5 \ -$WINEVER Tribes2.exe -dedicated -mod Classic \ No newline at end of file + +xvfb-run -a -w 5 $WINEVER Tribes2.exe -dedicated -mod Classic \ No newline at end of file diff --git a/_scripts/tribesnext-server-installer b/_scripts/tribesnext-server-installer index 8634513..8ea3ce7 100755 --- a/_scripts/tribesnext-server-installer +++ b/_scripts/tribesnext-server-installer @@ -31,7 +31,7 @@ function check_requirements { function get_files { if [ ! -f "$TMPBASE/$1" ] then - /usr/bin/wget --no-check-certificate "$2/$1" -O "$TMPBASE/$1" + /usr/bin/wget --no-check-certificate "$2$1" -O "$TMPBASE/$1" fi } @@ -52,7 +52,7 @@ fi # -- download files get_files tribes2gsi.exe "https://www.the-construct.net/downloads/tribes2/" "$TMPBASE" get_files TribesNext_rc2a.exe "https://www.tribesnext.com/files/" "$TMPBASE" -get_files ruby-1.9.0-2-i386-mswin32.zip "https://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/unstable" "$TMPBASE" +get_files ruby-1.9.0-2-i386-mswin32.zip "https://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/unstable/" "$TMPBASE" get_files classic_v152.zip "https://tribes2stats.com/files/mods/" "$TMPBASE" git clone "https://github.com/ChocoTaco1/TacoServer/" "$TMPBASE/TacoServer"