[MIRROR] Fix Docker build failing on a clean checkout (#2732)

* Fix Docker build failing on a clean checkout

* Update Dockerfile

* Update Dockerfile

* Update node

* Update Dockerfile

* Update node

* Update run_server.sh

* Update deploy.sh

Co-authored-by: Tad Hardesty <tad@platymuus.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>

.dockerignore

@@ -22,7 +22,6 @@ tgstation.int
 tgstation.rsc
 tgstation.lk
 tgstation.dyn.rsc
-libmariadb.dll
-rust_g.dll
-BSQL.dll
+*.dll
 Dockerfile
+tools/bootstrap/.cache

Dockerfile

@@ -41,8 +41,7 @@ RUN apt-get install -y --no-install-recommends \
 COPY . .
 
 RUN env TG_BOOTSTRAP_NODE_LINUX=1 tools/build/build \
-    && tools/deploy.sh /deploy \
-	&& rm /deploy/*.dll
+    && tools/deploy.sh /deploy
 
 # rust = base + rustc and i686 target
 FROM base AS rust
@@ -83,4 +82,4 @@ COPY --from=rust_g /rust_g/target/i686-unknown-linux-gnu/release/librust_g.so ./
 
 VOLUME [ "/tgstation/config", "/tgstation/data" ]
 ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]
-EXPOSE 1337
+EXPOSE 1337

tools/bootstrap/node

@@ -32,6 +32,7 @@ if [ "$(uname)" = "Linux" ] || [ ! -f "$NodeExe" ]; then
 		NodeExe="$NodeDir/node"
 
 		if [ ! -f "$NodeExe" ]; then
+			mkdir -p "$Cache"
 			Archive="$(realpath "$Cache/node-v$NodeVersion.tar.gz")"
 			curl "https://nodejs.org/download/release/v$NodeVersion/$NodeFullVersion.tar.gz" -o "$Archive"
 			(cd "$Cache" && tar xf "$Archive")
@@ -80,4 +81,4 @@ exec 4>&1
 PATH="$(readlink -f "$NodeDir"):$PATH"  # Set PATH so that recursive calls find it
 exitstatus=$({ { set +e; "$NodeExe" "$@" 2>&1 3>&-; printf %s $? >&3; } 4>&- | tee -a "$Log" 1>&4; } 3>&1)
 exec 4>&-
-exit "$exitstatus"
+exit "$exitstatus"

tools/ci/run_server.sh

@@ -2,7 +2,6 @@
 set -euo pipefail
 
 tools/deploy.sh ci_test
-rm ci_test/*.dll
 mkdir ci_test/config
 
 #test config

tools/deploy.sh

@@ -32,4 +32,6 @@ cp -r strings/* $1/strings/
 #find $1/_maps -name "*.dm" -type f -delete
 
 #dlls on windows
-cp *.dll $1/ || true
+if [ "$(uname -o)" = "Msys" ]; then
+	cp ./*.dll $1/
+fi