Skip to content

Commit 1b9c8c7

Browse files
authored
Merge pull request #2 from ManuelLR/dev
Update Flameshot to 0.8.1
2 parents db93124 + f124943 commit 1b9c8c7

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

Dockerfile

+9-12
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,24 @@ FROM debian:stable-slim
44

55
LABEL maintainer="@ManuelLR <[email protected]>"
66

7-
ENV GIT_URL https://github.com/lupoDharkael/flameshot.git
8-
ENV GIT_BRANCH v0.6.0
7+
ENV GIT_URL https://github.com/flameshot-org/flameshot.git
8+
ENV GIT_BRANCH v0.8.1
99

10-
ENV BUILD_PACKAGES git g++ build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5svg5-dev
11-
ENV RUNTIME_PACKAGES libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 openssl ca-certificates
10+
ENV BUILD_PACKAGES git g++ cmake build-essential qt5-default qttools5-dev-tools libqt5svg5-dev qttools5-dev ca-certificates
11+
ENV RUNTIME_PACKAGES libqt5dbus5 libqt5network5 libqt5core5a libqt5widgets5 libqt5gui5 libqt5svg5 openssl ca-certificates
1212

1313
ENV DEBIAN_FRONTEND=noninteractive
1414

15-
WORKDIR /usr/src/
16-
1715
RUN set -x \
1816
&& apt update \
19-
&& apt install -y $BUILD_PACKAGES \
20-
&& cd /usr/src/ \
17+
&& apt install -y --no-install-recommends $BUILD_PACKAGES \
18+
&& cd /tmp/ \
2119
&& git clone $GIT_URL flameshot --branch $GIT_BRANCH \
2220
&& cd flameshot \
23-
&& qmake && make -j 3 && make install && make clean \
21+
&& cmake . && make -j 3 && make install && make clean \
22+
&& rm -rf /tmp/flameshot \
2423
&& apt-get remove --purge --auto-remove -y $BUILD_PACKAGES \
25-
&& apt-get install -y $RUNTIME_PACKAGES \
24+
&& apt-get install -y --no-install-recommends $RUNTIME_PACKAGES \
2625
&& rm -rf /var/lib/apt/lists/*
2726

28-
RUN ln -s /usr/src/flameshot /usr/bin/flameshot
29-
3027
CMD flameshot

0 commit comments

Comments
 (0)