fix dockerfiles

This commit is contained in:
therecipe 2018-08-16 00:11:10 +02:00
parent abcbd186f2
commit fcc16d8acf
6 changed files with 24 additions and 23 deletions

View file

@ -1,20 +1,3 @@
FROM therecipe/qt:js_base_3 as base
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtcharts.git /opt/qtcharts
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtxmlpatterns.git /opt/qtxmlpatterns
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtcanvas3d.git /opt/qtcanvas3d
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtdatavis3d.git /opt/qtdatavis3d
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtmultimedia.git /opt/qtmultimedia
RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
&& cd /opt/qtcharts && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtxmlpatterns && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtcanvas3d && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtdatavis3d && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtmultimedia && /opt/qtbase/bin/qmake *.pro && make" > $HOME/build.sh \
&& chmod +x $HOME/build.sh && $HOME/build.sh
FROM ubuntu:16.04
LABEL maintainer therecipe
@ -31,9 +14,9 @@ COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt
COPY --from=therecipe/qt:linux /opt/Qt/5.11.1/gcc_64/include /opt/Qt/5.11.1/gcc_64/include
COPY --from=therecipe/qt:linux /opt/Qt/Docs /opt/Qt/Docs
COPY --from=base $HOME/emsdk $HOME/emsdk
COPY --from=base $HOME/.emscripten $HOME/.emscripten
COPY --from=base /opt /opt
COPY --from=therecipe/qt:js_base_4 $HOME/emsdk $HOME/emsdk
COPY --from=therecipe/qt:js_base_4 $HOME/.emscripten $HOME/.emscripten
COPY --from=therecipe/qt:js_base_4 /opt /opt
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install git && apt-get -qq clean
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean

View file

@ -1,7 +1,7 @@
FROM therecipe/qt:js_base_1
LABEL maintainer therecipe
RUN git clone -b wip/webassembly https://code.qt.io/qt/qtdeclarative.git /opt/qtdeclarative
RUN git clone -b wip/webassembly https://code.qt.io/qt/qtdeclarative.git /opt/qtdeclarative && cd /opt/qtdeclarative && git checkout -f a62637358f23546a9edef397fd4d5869a16f0645
RUN git clone -b wip/webassembly https://code.qt.io/qt/qtwebsockets.git /opt/qtwebsockets
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtgraphicaleffects.git /opt/qtgraphicaleffects

View file

@ -0,0 +1,16 @@
FROM therecipe/qt:js_base_3
LABEL maintainer therecipe
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtcharts.git /opt/qtcharts
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtxmlpatterns.git /opt/qtxmlpatterns
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtcanvas3d.git /opt/qtcanvas3d
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtdatavis3d.git /opt/qtdatavis3d
RUN git clone -b 5.11.0 https://code.qt.io/qt/qtmultimedia.git /opt/qtmultimedia
RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
&& cd /opt/qtcharts && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtxmlpatterns && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtcanvas3d && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtdatavis3d && /opt/qtbase/bin/qmake *.pro && make \
&& cd /opt/qtmultimedia && /opt/qtbase/bin/qmake *.pro && make" > $HOME/build.sh \
&& chmod +x $HOME/build.sh && $HOME/build.sh

View file

@ -14,6 +14,8 @@ RUN curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_2"}
RUN sleep 65
RUN curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
RUN sleep 65
RUN curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
RUN sleep 65
RUN curl -H "Content-Type: application/json" --data '{"docker_tag": "js"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
RUN sleep 65
RUN curl -H "Content-Type: application/json" --data '{"docker_tag": "android"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/

View file

@ -4,4 +4,4 @@ LABEL maintainer therecipe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash 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 scons sed unzip wget xz-utils
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' gcc gettext openssl glib lzo icu4c
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' gcc gettext openssl glib lzo

View file

@ -1,4 +1,4 @@
FROM therecipe/qt:windows_32_static_self_base_1
LABEL maintainer therecipe
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite