rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update dockerfiles with the qt-svg dependency

This commit is contained in:
Konstantinos Sideris 2018-05-18 20:36:12 +03:00
parent 1bc4260249
commit 4d3709615a
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -5,12 +5,13 @@ RUN \
apt-get install -y software-properties-common apt-get install -y software-properties-common
RUN \ RUN \
add-apt-repository -y ppa:beineri/opt-qt592-xenial && \ add-apt-repository -y ppa:beineri/opt-qt-5.10.1-xenial && \
apt-get update -qq && \ apt-get update -qq && \
apt-get install -y \ apt-get install -y \
qt59base \ qt510base \
qt59tools \ qt510tools \
qt59multimedia qt510svg \
qt510multimedia
RUN \ RUN \
add-apt-repository ppa:ubuntu-toolchain-r/test && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \
@ -31,10 +32,7 @@ RUN update-alternatives --install \
clang-format \ clang-format \
/usr/bin/clang-format-5.0 100 /usr/bin/clang-format-5.0 100
RUN apt-get -y install ruby ruby-dev rubygems rpm && \ ENV PATH=/opt/qt510/bin:$PATH
gem install --no-ri --no-rdoc fpm
ENV PATH=/opt/qt59/bin:$PATH
RUN mkdir /build RUN mkdir /build

4
Dockerfile.debian
View File

@ -6,12 +6,10 @@ RUN apt-get install -y gcc g++ cmake clang liblmdb-dev
RUN apt-get install -y mesa-common-dev wget fuse git RUN apt-get install -y mesa-common-dev wget fuse git
RUN apt-get -y install ruby ruby-dev rubygems rpm && \
gem install --no-ri --no-rdoc fpm
RUN apt-get update -qq && \ RUN apt-get update -qq && \
apt-get install -y \ apt-get install -y \
qt5-default \ qt5-default \
libqt5svg5-dev \
qtbase5-dev \ qtbase5-dev \
qttools5-dev-tools \ qttools5-dev-tools \
qttools5-dev \ qttools5-dev \