From bf71582aaf8b9d2dca1fd5cc90494ad27e103894 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Wed, 9 May 2018 19:43:56 +0200 Subject: [PATCH] Using new qt build and runtime base images --- Dockerfile | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3cd7cd7..623e84e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,4 @@ -FROM ubuntu:artful - -RUN ln -snf /usr/share/zoneinfo/Europe/Vienna /etc/localtime && echo Europe/Vienna > /etc/timezone - -RUN apt update \ - && apt install tzdata -y \ - && rm /var/lib/apt/lists/* /var/log/* -Rf - -RUN apt update \ - && apt install libssl1.0.0 ca-certificates libqt5core5a libqt5gui5 libqt5network5 libqt5multimedia5 -y \ - && rm /var/lib/apt/lists/* /var/log/* -Rf - -RUN apt update \ - && apt install git-core g++ make qt5-default qtmultimedia5-dev qttools5-dev qttools5-dev-tools -y \ - && rm /var/lib/apt/lists/* /var/log/* -Rf +FROM 0xfeedc0de64/qt-build ADD . /tmp/WifiLamp @@ -23,17 +9,7 @@ RUN mkdir -p /tmp/build_WifiLamp \ -FROM ubuntu:artful - -RUN ln -snf /usr/share/zoneinfo/Europe/Vienna /etc/localtime && echo Europe/Vienna > /etc/timezone - -RUN apt update \ - && apt install tzdata -y \ - && rm /var/lib/apt/lists/* /var/log/* -Rf - -RUN apt update \ - && apt install libssl1.0.0 ca-certificates libqt5core5a libqt5gui5 libqt5network5 libqt5multimedia5 -y \ - && rm /var/lib/apt/lists/* /var/log/* -Rf +FROM 0xfeedc0de64/qt-runtime COPY --from=0 /tmp/build_WifiLamp/WifiLamp /root/