Skip to content

Commit

Permalink
Fix Docker build failing on a clean checkout (#56190)
Browse files Browse the repository at this point in the history
Follow-up to #56175 which turned out to be accidentally relying on Node already being downloaded.
  • Loading branch information
SpaceManiac authored Jan 16, 2021
1 parent aef392d commit 8ca7616
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tools/bootstrap/node
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion tools/ci/run_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -euo pipefail

tools/deploy.sh ci_test
rm ci_test/*.dll
mkdir ci_test/config

#test config
Expand Down
4 changes: 3 additions & 1 deletion tools/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8ca7616

Please sign in to comment.