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

MXE Docker build: clean up Dockerfile

Browse source 
Instead of trying to do it all in one step rely on --squash to do its
job. Don't try to be so aggressive in removing things, it saves very
little space and caused builds to fail.

This results in version 0.9 of the MXE build container

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-05-17 15:55:17 -07:00
parent 3debd92734
commit d1750b3fb3
1 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,8 @@ From ubuntu:18.04
RUN mkdir -p /win RUN mkdir -p /win
ADD settings.mk /win ADD settings.mk /win
RUN apt-get update && apt-get upgrade -y && \ RUN apt-get update && apt-get upgrade -y
apt-get install -y \ RUN apt-get install -y \
autoconf \ autoconf \
automake \ automake \
autopoint \ autopoint \
@ -37,39 +37,17 @@ RUN apt-get update && apt-get upgrade -y && \
wget \ wget \
xz-utils \ xz-utils \
lzip \ lzip \
scons ; \ scons
cd /win ; git clone git://github.com/mxe/mxe ; \ RUN cd /win ; git clone git://github.com/mxe/mxe ; \
cd mxe ; \ cd mxe ; \
git checkout 9f6b9c6f58510bedfa0bf9f87de9a214abe6b653 ; \ git checkout 9f6b9c6f58510bedfa0bf9f87de9a214abe6b653 ;
mv ../settings.mk . ; \ RUN mv /win/settings.mk /win/mxe
make -j 6 2>&1 | tee build.log ; \ RUN cd /win/mxe ; \
mkdir -p neolit ; cd neolit ; git clone -b wip/win http://code.qt.io/cgit/qt/qtconnectivity.git ; \ make -j 6 2>&1 | tee build.log ;
cd qtconnectivity ; \ RUN cd /win/mxe ; \
mkdir -p neolit ; cd neolit ; git clone -b wip/win git://github.com/qt/qtconnectivity
RUN cd /win/mxe/neolit/qtconnectivity ; \
PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /win/mxe/usr/i686-w64-mingw32.shared/qt5/bin/qmake qtconnectivity.pro ; \ PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /win/mxe/usr/i686-w64-mingw32.shared/qt5/bin/qmake qtconnectivity.pro ; \
PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make -j 6 ; \ PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make -j 6 ; \
PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make install ; \ PATH=/win/mxe/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin make install ;
rm -rf /win/mxe/pkg ; \ RUN rm -rf /win/mxe/pkg
apt-get purge -y --auto-remove \
autopoint \
bison \
flex \
g++ \
g++-multilib \
gettext \
gperf \
intltool \
libc6-dev-i386 \
libgdk-pixbuf2.0-dev \
libltdl-dev \
libssl-dev \
libtool-bin \
libxml-parser-perl \
openssl \
p7zip-full \
perl \
python \
ruby \
unzip \
xz-utils \
lzip \
scons