mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build Windows artifact with new container

Browse source 
This should get us a current version of Qt and many other newer libraries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-06 13:20:20 -08:00
parent 9cfe656342
commit 2d63591ab8
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/docker/mxe-build-container/Dockerfile
View file

@ -63,7 +63,7 @@ ADD qtconnectivity-1.patch /win/mxe/src/qtconnectivity-1.patch
# Move the settings into place to build everything that we need
# separate download from build so that we can redo the build
ADD settings.mk /win/mxe/settings.mk
RUN [ -f /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
RUN cd /usr/bin ; ln -s -f python3 python
RUN cd /win/mxe ; \
make -j 6 download 2>&1 | tee mxe-build.log
RUN cd /win/mxe ; \

5
scripts/docker/mxe-build-container/build-container.sh
View file

@ -7,11 +7,12 @@ MXE_SHA="0d21cf2e31d4e6c0"
SCRIPTPATH=$(dirname $0)
# version of the docker image
VERSION=3.0
VERSION=3.0.1
pushd $SCRIPTPATH
# we use the 'experimental' --squash argument to significantly reduce the size of the massively huge
# Docker container this produces
docker build --squash -t subsurface/mxe-build-container:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile .
docker build -t subsurface/mxe-build-container:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile .
docker images
popd