From 030f6e97221d06904a5ef7ce5bc63b44ca77461d Mon Sep 17 00:00:00 2001 From: seefo Date: Thu, 11 Jan 2018 22:11:47 -0500 Subject: [PATCH] Added Java8 to swg-runtime, now builds scripts --- gameserver/Dockerfile | 6 +++--- gameserver/utils/entrypoint.sh | 1 + utils/get_redist.sh | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gameserver/Dockerfile b/gameserver/Dockerfile index 658765f..eb97396 100644 --- a/gameserver/Dockerfile +++ b/gameserver/Dockerfile @@ -17,9 +17,9 @@ run fakeroot alien --target=amd64 -i /redist/oracle-instantclient12.1-sqlplus-12 # install java run cd /redist/ && \ - tar -xvzf IBMJava2-SDK-1.4.2-13.18.tgz && \ - mv IBMJava2-142/ /opt && \ - ln -s /opt/IBMJava2-142 /usr/java + tar -xf jdk-8u151-linux-i586.tar.gz -C /opt && \ + update-alternatives --install /usr/bin/java java /opt/jdk1.8.0_151/bin/java 100 && \ + update-alternatives --install /usr/bin/javac javac /opt/jdk1.8.0_151/bin/javac 100 # build and install curl add src/external/3rd/library/curl/curl-7.45.0 /redist/curl/ diff --git a/gameserver/utils/entrypoint.sh b/gameserver/utils/entrypoint.sh index 4e259ee..996aa03 100755 --- a/gameserver/utils/entrypoint.sh +++ b/gameserver/utils/entrypoint.sh @@ -5,6 +5,7 @@ if [[ -z "${SWG_BUILD_DSRC}" ]]; then echo "Running Server" else echo "Building DSRC" + $basedir/utils/content/build_java_multi.sh $basedir/utils/content/build_miff.sh $basedir/utils/content/build_tab.sh $basedir/utils/content/build_tpf_multi.sh diff --git a/utils/get_redist.sh b/utils/get_redist.sh index cb0b178..e7680e7 100755 --- a/utils/get_redist.sh +++ b/utils/get_redist.sh @@ -17,3 +17,7 @@ fi if [ ! -f ./utils/redist/IBMJava2-SDK-1.4.2-13.18.tgz ]; then wget https://bitbucket.org/seefoe/src/downloads/IBMJava2-SDK-1.4.2-13.18.tgz -P ./utils/redist/ fi + +if [ ! -f ./utils/redist/jdk-8u151-linux-i586.tar.gz ]; then + wget https://bitbucket.org/seefoe/src/downloads/jdk-8u151-linux-i586.tar.gz -P ./utils/redist/ +fi