From 755c5057d8090c8bd33067c0f757b591e8dca10e Mon Sep 17 00:00:00 2001 From: loonycyborg Date: Thu, 7 Nov 2019 20:53:48 +0300 Subject: [PATCH] Make docker builds copy wesnothd to output/ too --- utils/dockerbuilds/mingw/Dockerfile | 2 +- utils/dockerbuilds/steamrt/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dockerbuilds/mingw/Dockerfile b/utils/dockerbuilds/mingw/Dockerfile index a424563ff1d9..1ace310c015e 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/ && cd /output && python3 /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 diff --git a/utils/dockerbuilds/steamrt/Dockerfile b/utils/dockerbuilds/steamrt/Dockerfile index 92f880fc39b2..f01c8bb999f9 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 -r /staging/* /output/ +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/