Skip to content
This repository has been archived by the owner on Sep 12, 2021. It is now read-only.

Fix Docker build failing on a clean checkout (TG#56190) #741

Merged
merged 1 commit into from
Jan 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -3,7 +3,6 @@ set -euo pipefail
EXIT_CODE=0

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

#test config
Expand Down
6 changes: 3 additions & 3 deletions tools/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ cp -r strings/* $1/strings/
#find $1/_maps -name "*.dm" -type f -delete

#dlls on windows
cp *.dll $1/ || true
cp rust_g* $1/ || true
cp *byond-extools.* $1/ || true
if [ "$(uname -o)" = "Msys" ]; then
cp ./*.dll $1/
fi