From f2b89dca2537fc482528947c13f9d2bdb8da614c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Sat, 26 Sep 2020 21:20:03 +0200 Subject: [PATCH 1/2] Test update to 0.8.1 --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b741cc1..f02422b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,11 @@ FROM debian:stable-slim LABEL maintainer="@ManuelLR " -ENV GIT_URL https://github.com/lupoDharkael/flameshot.git -ENV GIT_BRANCH v0.6.0 +ENV GIT_URL https://github.com/flameshot-org/flameshot.git +ENV GIT_BRANCH v0.8.1 -ENV BUILD_PACKAGES git g++ build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5svg5-dev -ENV RUNTIME_PACKAGES libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 openssl ca-certificates +ENV BUILD_PACKAGES git g++ cmake build-essential qt5-default qttools5-dev-tools libqt5svg5-dev qttools5-dev +ENV RUNTIME_PACKAGES libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 libqt5svg5 openssl ca-certificates ENV DEBIAN_FRONTEND=noninteractive @@ -20,7 +20,7 @@ RUN set -x \ && cd /usr/src/ \ && git clone $GIT_URL flameshot --branch $GIT_BRANCH \ && cd flameshot \ - && qmake && make -j 3 && make install && make clean \ + && cmake && make -j 3 && make install && make clean \ && apt-get remove --purge --auto-remove -y $BUILD_PACKAGES \ && apt-get install -y $RUNTIME_PACKAGES \ && rm -rf /var/lib/apt/lists/* From f124943cd03891dfc2021364963d232ae4c7133b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Sun, 27 Sep 2020 19:00:50 +0200 Subject: [PATCH 2/2] Size reduction --- Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f02422b..628c5de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,24 +7,21 @@ LABEL maintainer="@ManuelLR " ENV GIT_URL https://github.com/flameshot-org/flameshot.git ENV GIT_BRANCH v0.8.1 -ENV BUILD_PACKAGES git g++ cmake build-essential qt5-default qttools5-dev-tools libqt5svg5-dev qttools5-dev +ENV BUILD_PACKAGES git g++ cmake build-essential qt5-default qttools5-dev-tools libqt5svg5-dev qttools5-dev ca-certificates ENV RUNTIME_PACKAGES libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 libqt5svg5 openssl ca-certificates ENV DEBIAN_FRONTEND=noninteractive -WORKDIR /usr/src/ - RUN set -x \ && apt update \ - && apt install -y $BUILD_PACKAGES \ - && cd /usr/src/ \ + && apt install -y --no-install-recommends $BUILD_PACKAGES \ + && cd /tmp/ \ && git clone $GIT_URL flameshot --branch $GIT_BRANCH \ && cd flameshot \ - && cmake && make -j 3 && make install && make clean \ + && cmake . && make -j 3 && make install && make clean \ + && rm -rf /tmp/flameshot \ && apt-get remove --purge --auto-remove -y $BUILD_PACKAGES \ - && apt-get install -y $RUNTIME_PACKAGES \ + && apt-get install -y --no-install-recommends $RUNTIME_PACKAGES \ && rm -rf /var/lib/apt/lists/* -RUN ln -s /usr/src/flameshot /usr/bin/flameshot - CMD flameshot