diff --git a/utils/dockerbuilds/make_mingw_build b/utils/dockerbuilds/make_mingw_build index 92faea8ff55..b25489dbf9f 100755 --- a/utils/dockerbuilds/make_mingw_build +++ b/utils/dockerbuilds/make_mingw_build @@ -2,4 +2,6 @@ cd mingw docker build -t mingw-wesnoth . -docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../mingwbuild:/output mingw-wesnoth +rm -rf ../mingwbuild +mkdir ../mingwbuild +docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../mingwbuild:/output --tmpfs /build -u $UID mingw-wesnoth diff --git a/utils/dockerbuilds/make_steam_build b/utils/dockerbuilds/make_steam_build index 11f1d1a66a0..33b84c80686 100755 --- a/utils/dockerbuilds/make_steam_build +++ b/utils/dockerbuilds/make_steam_build @@ -2,4 +2,6 @@ cd steamrt docker build -t steamos-wesnoth . -docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output steamos-wesnoth +rm -rf ../steambuild +mkdir ../steambuild +docker run -it -v "$PWD"/../../..:/wesnoth -v "$PWD"/../steambuild:/output --tmpfs /build:exec -u $UID steamos-wesnoth diff --git a/utils/dockerbuilds/mingw/Dockerfile b/utils/dockerbuilds/mingw/Dockerfile index 1ace310c015..381e10c27d0 100644 --- a/utils/dockerbuilds/mingw/Dockerfile +++ b/utils/dockerbuilds/mingw/Dockerfile @@ -17,4 +17,4 @@ RUN pacman-cross -S --noconfirm \ COPY get_dlls.py /scripts/get_dlls.py -ENTRYPOINT mkdir /build && cd /build && scons -j `nproc` arch=x86-64 prefix=/windows/mingw64 gtkdir=/windows/mingw64 host=x86_64-w64-mingw32 -Y /wesnoth && cp /build/wesnoth.exe /output/ && cp /build/wesnothd.exe /output/ && cd /output && python3 /scripts/get_dlls.py +ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` arch=x86-64 prefix=/windows/mingw64 gtkdir=/windows/mingw64 host=x86_64-w64-mingw32 -Y /wesnoth && cp /build/wesnoth.exe /output/ && cp /build/wesnothd.exe /output/ && cd /output && python3 /scripts/get_dlls.py diff --git a/utils/dockerbuilds/steamrt/Dockerfile b/utils/dockerbuilds/steamrt/Dockerfile index f01c8bb999f..388fae59e31 100644 --- a/utils/dockerbuilds/steamrt/Dockerfile +++ b/utils/dockerbuilds/steamrt/Dockerfile @@ -12,4 +12,4 @@ RUN cd /src/boost && ./bootstrap.sh --with-libraries=iostreams,regex,system,file COPY start.sh /staging/start.sh RUN mkdir /staging/lib64 && cp /lib/libicu*.so.* /lib/x86_64-linux-gnu/libhistory.so.6 /staging/lib64/ -ENTRYPOINT mkdir /build && cd /build && scons -j `nproc` ctool=gcc-5 cxxtool=g++-5 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/ +ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` ctool=gcc-5 cxxtool=g++-5 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/