From 3866e16c9cb5a9d4aebee75bca44b6d09e3b2a68 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 6 Sep 2019 11:25:47 -0400 Subject: [PATCH 1/7] updating to newer base images and updating the entrypoint --- Dockerfile | 4 ++-- entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f98cf18..ad2a345 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Isaac A., RUN apt update \ && apt upgrade -y \ && apt install -y lib32gcc1 lib32stdc++6 unzip curl iproute2 libgdiplus \ - && curl -sL https://deb.nodesource.com/setup_6.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_10.x | bash - \ && apt install -y nodejs \ && mkdir /node_modules \ && npm install --prefix / ws \ diff --git a/entrypoint.sh b/entrypoint.sh index 33a9054..6fd15e2 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -14,7 +14,7 @@ echo ":/home/container$ ${MODIFIED_STARTUP}" # OxideMod has been replaced with uMod if [ -f OXIDE_FLAG ] || [ "${OXIDE}" = 1 ] || [ "${UMOD}" = 1 ]; then echo "Updating uMod..." - curl -sSL "https://umod.org/games/rust/download" > umod.zip + curl -sSL "https://umod.org/games/rust/download/develop" > umod.zip unzip -o -q umod.zip rm umod.zip echo "Done updating uMod!" From d7c6028e91d527eb0ddd535fddeea92ea1167173 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 6 Sep 2019 11:27:09 -0400 Subject: [PATCH 2/7] set image maintainer to a label tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad2a345..a7b0d67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:18.04 -MAINTAINER Isaac A., +LABEL author="Isaac A." maintainer="isaac@isaacs.site" RUN apt update \ && apt upgrade -y \ From 9f7febc1215d13349830bede912e13000ce51433 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 6 Sep 2019 16:24:52 -0400 Subject: [PATCH 3/7] drop to nodejs 6 again --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a7b0d67..531d7fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ LABEL author="Isaac A." maintainer="isaac@isaacs.site" RUN apt update \ && apt upgrade -y \ && apt install -y lib32gcc1 lib32stdc++6 unzip curl iproute2 libgdiplus \ - && curl -sL https://deb.nodesource.com/setup_10.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_6.x | bash - \ && apt install -y nodejs \ && mkdir /node_modules \ && npm install --prefix / ws \ From 1e81a38ab456987d9f0d29730cd9875a4aed26ab Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 6 Sep 2019 17:02:36 -0400 Subject: [PATCH 4/7] actually install npm because reasons --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 531d7fa..85a9725 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt update \ && apt upgrade -y \ && apt install -y lib32gcc1 lib32stdc++6 unzip curl iproute2 libgdiplus \ && curl -sL https://deb.nodesource.com/setup_6.x | bash - \ - && apt install -y nodejs \ + && apt install -y nodejs npm \ && mkdir /node_modules \ && npm install --prefix / ws \ && useradd -d /home/container -m container From 155bc850b7d3d9dc54b368aa6574fbd75dd0518e Mon Sep 17 00:00:00 2001 From: MissFox0810 Date: Sat, 7 Sep 2019 03:15:39 +0100 Subject: [PATCH 5/7] Add a callback handler to wrapper Added a callback handler to the appendfile. --- wrapper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wrapper.js b/wrapper.js index 3f61a94..752cbee 100644 --- a/wrapper.js +++ b/wrapper.js @@ -57,7 +57,9 @@ var poll = function( ) { if (json.Message !== undefined && json.Message.length > 0) { console.log(json.Message); const fs = require("fs"); - fs.appendFile("latest.log", "\n" + json.Message); + fs.appendFile("latest.log", "\n" + json.Message, (err) => { + if (err) console.log("Callback error in appendFile:"+err); + }); } } else { console.log("Error: Invalid JSON received"); From 1865f4da7d2bae6635be369b62c3c3ea24f5cd82 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Sep 2019 09:58:25 -0400 Subject: [PATCH 6/7] fix for first deprecated message This should fix the one deprecated message --- wrapper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wrapper.js b/wrapper.js index 752cbee..43b707b 100644 --- a/wrapper.js +++ b/wrapper.js @@ -2,7 +2,9 @@ var startupCmd = ""; const fs = require("fs"); -fs.writeFile("latest.log", ""); +fs.writeFile("latest.log", "\n" + json.Message, (err) => { + if (err) console.log("Callback error in appendFile:"+err); +}); var args = process.argv.splice(process.execArgv.length + 2); for (var i = 0; i < args.length; i++) { From 899a560f49e0fc0905ee96fa1b7e642641f0c7fc Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 8 Sep 2019 10:19:22 -0400 Subject: [PATCH 7/7] update wrapper to fix json error --- wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper.js b/wrapper.js index 43b707b..51a4c62 100644 --- a/wrapper.js +++ b/wrapper.js @@ -2,7 +2,7 @@ var startupCmd = ""; const fs = require("fs"); -fs.writeFile("latest.log", "\n" + json.Message, (err) => { +fs.writeFile("latest.log", "", (err) => { if (err) console.log("Callback error in appendFile:"+err); });