From 8c641402207dcee2f17de6f18c463a40b6434847 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 24 Nov 2019 13:35:09 -0800 Subject: GitHub Actions: add two stage MXE container build Based on ideas from Anton - both the basic building of containers in the first place as well as the workaround for the 6h build limit. Because GitHub Actions are limited to 6 hours we split the creation of the MXE container into two steps and push the intermediary container after stage 1 to docker hub. Right now each of the steps takes about 3.5 hours, so hopefully even with changes in the future this will continue to work. This commit also introduces use of docker hub instead of GitHub's own registry (since strangely right now GitHub actions cannot run containers from GitHub's private registry). In order for this to work, we need to have the docker credentials in secrets in GitHub. As a result, only people who can create branches in our repository can easily test changes to the container images. Others can modify the code to use a different docker hub account and provide those secrets in their own GitHub account. Not ideal, but of course we cannot allow every pull request to potentially overwrite docker images in our "official" docker hub account. Suggested-by: Anton Lundin Signed-off-by: Dirk Hohndel --- .../docker/mxe-build-container/Dockerfile-stage1 | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 scripts/docker/mxe-build-container/Dockerfile-stage1 (limited to 'scripts/docker/mxe-build-container/Dockerfile-stage1') diff --git a/scripts/docker/mxe-build-container/Dockerfile-stage1 b/scripts/docker/mxe-build-container/Dockerfile-stage1 new file mode 100644 index 000000000..501bfe6ce --- /dev/null +++ b/scripts/docker/mxe-build-container/Dockerfile-stage1 @@ -0,0 +1,58 @@ +# Build the image using the --build-arg option, e.g.: +# docker build -t boret/myimage:0.1 --build-arg=mxe_sha=123ABC456 . +# + +# Start from Ubuntu +From ubuntu:18.04 +ARG mxe_sha=master +ENV _ver=${mxe_sha} + +# update and set up the packages we need for this cross build +RUN apt-get update && apt-get upgrade -y +RUN apt-get install -y \ + autoconf \ + automake \ + autopoint \ + bash \ + binutils \ + bison \ + bzip2 \ + flex \ + g++ \ + g++-multilib \ + gettext \ + git \ + gperf \ + intltool \ + libc6-dev-i386 \ + libgdk-pixbuf2.0-dev \ + libltdl-dev \ + libssl-dev \ + libtool-bin \ + libxml-parser-perl \ + make \ + openssl \ + p7zip-full \ + patch \ + perl \ + pkg-config \ + python \ + ruby \ + sed \ + unzip \ + wget \ + xz-utils \ + lzip \ + scons + +# copy over the partial MXE settings (simply missing QtWebKit so we don't exceed the 6h limit) +RUN mkdir -p /win +ADD settings-stage1.mk /win/settings.mk +RUN cd /win ; git clone git://github.com/mxe/mxe ; \ + cd mxe ; \ + git checkout ${_ver} ; +RUN mv /win/settings.mk /win/mxe +RUN cd /win/mxe ; \ + make -j 6 2>&1 | tee build.log ; +RUN cd /win/mxe ; \ + make MXE_TARGETS=i686-w64-mingw32.static glib -j 6 2>&1 | tee -a build.log ; -- cgit v1.2.3-70-g09d2