Skip to content

Commit ea94b7b

Browse files
committed
update the build env label
1 parent 8d7fe48 commit ea94b7b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build/build-win64-from-linux.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ if [[ $(id -u) -eq 0 ]]; then
3232
chown -R $builder_uid win64-cross
3333
fi
3434

35-
# Assumes you built a container image called dfhack-build-msvc from
36-
# https://github.com/BenLubar/build-env/tree/master/msvc, see
37-
# docs/dev/compile/Compile.rst.
35+
# Pulls the MSVC build env container from the GitHub registry
3836
#
3937
# NOTE: win64-cross is mounted in /src/build due to the hardcoded `cmake ..` in
4038
# the Dockerfile
@@ -44,7 +42,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b
4442
-e steam_username \
4543
-e steam_password \
4644
--name dfhack-win \
47-
ghcr.io/dfhack/build-env:msvc \
45+
ghcr.io/dfhack/build-env:master \
4846
bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install" \
4947
; then
5048
echo

docs/dev/compile/Compile.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ Step 1: prepare a build container
303303
On your Linux host, install and run the docker daemon and then run these commands::
304304

305305
xhost +local:root
306-
docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win ghcr.io/dfhack/build-env:msvc
306+
docker run -it --env="DISPLAY" --env="QT_X11_NO_MITSHM=1" --volume=/tmp/.X11-unix:/tmp/.X11-unix --user buildmaster --name dfhack-win ghcr.io/dfhack/build-env:master
307307

308308
The ``xhost`` command and ``--env`` parameters are there so you can eventually
309309
run Dwarf Fortress from the container and have it display on your host.

0 commit comments

Comments
 (0)