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

docker-mxe: Make Dockerfile reusable

Browse source 
Passing an argument on the docker build command line avoids the need to
modify the Dockerfile for each image build.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Salvador Cuñat 2019-01-29 22:58:21 +01:00 • committed by Dirk Hohndel
parent 967f9fb590
commit aab658fc9f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,10 @@
From ubuntu:18.04 # Build the image using the --build-arg option, e.g.:
# docker build -t boret/myimage:0.1 --build-arg=mxe_sha=123ABC456 .
#
From ubuntu:18.04
ARG mxe_sha=master
ENV _ver=${mxe_sha}
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
@ -40,12 +45,12 @@ RUN apt-get install -y \
scons scons
RUN 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 ${_ver} ;
RUN mv /win/settings.mk /win/mxe RUN mv /win/settings.mk /win/mxe
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \
make -j 6 2>&1 | tee build.log ; make -j 6 2>&1 | tee build.log ;
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \
make MXE_TARGETS=i686-w64-mingw32.static glib -j 6 2>&1 |tee build.log ; make MXE_TARGETS=i686-w64-mingw32.static glib -j 6 2>&1 | tee build.log ;
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \
mkdir -p neolit ; cd neolit ; git clone -b wip/win git://github.com/qt/qtconnectivity mkdir -p neolit ; cd neolit ; git clone -b wip/win git://github.com/qt/qtconnectivity
RUN cd /win/mxe/neolit/qtconnectivity ; \ RUN cd /win/mxe/neolit/qtconnectivity ; \