diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-08-02 15:17:07 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-08-02 18:38:42 +0200 |
| commit | 053797a0a2ac9274ab3289ea4341bcedd6d13515 (patch) | |
| tree | 9499d7a3363e6beb90d11c2efccd2934de8e12db | |
| parent | d4f35c0a8dd88eb64f6afd63047fbfbf43a1d3c6 (diff) | |
| download | kube-053797a0a2ac9274ab3289ea4341bcedd6d13515.tar.gz kube-053797a0a2ac9274ab3289ea4341bcedd6d13515.zip | |
Upgrade docker container to fc28
| -rw-r--r-- | docker/Dockerfile | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b4820988..906a1b76 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile | |||
| @@ -1,35 +1,18 @@ | |||
| 1 | FROM fedora:27 | 1 | FROM fedora:28 |
| 2 | 2 | ||
| 3 | RUN dnf -y update | 3 | RUN dnf -y update |
| 4 | 4 | ||
| 5 | RUN dnf -y install gcc-c++ git doxygen cmake bzr vim tar ninja-build clang procps-ng libcxx-devel sudo rsyslog | 5 | RUN dnf -y install gcc-c++ git doxygen cmake bzr vim tar make ninja-build clang procps-ng libcxx-devel sudo rsyslog llvm \ |
| 6 | 6 | extra-cmake-modules qt5-qtbase-devel libgit2-devel lmdb-devel libcurl-devel xapian-core-devel flatbuffers-devel \ | |
| 7 | #Sink deps | 7 | gdb xterm perf valgrind strace kcachegrind dbus-x11 gammaray heaptrack hotspot \ |
| 8 | RUN dnf -y install extra-cmake-modules qt5-qtbase-devel libgit2-devel lmdb-devel libcurl-devel xapian-core-devel flatbuffers-devel | 8 | qt5-qtquickcontrols qt5-qtquickcontrols2-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel \ |
| 9 | 9 | kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel gpgme-devel kf5-kcalendarcore-devel \ | |
| 10 | #Test and debugging | 10 | cyrus-imapd cyrus-sasl cyrus-sasl-devel cyrus-sasl-plain gnupg2-smime pinentry-gtk \ |
| 11 | RUN dnf -y install gdb xterm perf valgrind strace kcachegrind dbus-x11 gammaray heaptrack | 11 | google-noto-serif-fonts google-noto-sans-fonts \ |
| 12 | #Required for the symbolizer for asan | 12 | xorg-x11-server-Xvfb |
| 13 | RUN dnf -y install llvm | ||
| 14 | |||
| 15 | #kf5-mime | ||
| 16 | RUN dnf -y install cyrus-sasl-devel | ||
| 17 | |||
| 18 | #Stuff for kube | ||
| 19 | RUN dnf -y install qt5-qtquickcontrols qt5-qtquickcontrols2-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel | ||
| 20 | RUN dnf -y install kf5-ki18n-devel kf5-kcodecs-devel kf5-kcontacts-devel kf5-kmime-devel gpgme-devel kf5-kcalendarcore-devel | ||
| 21 | |||
| 22 | # Imap tests | ||
| 23 | RUN dnf -y install cyrus-imapd cyrus-sasl cyrus-sasl-plain gnupg2-smime pinentry-gtk | ||
| 24 | |||
| 25 | #Fonts | ||
| 26 | RUN dnf -y install google-noto-serif-fonts google-noto-sans-fonts | ||
| 27 | |||
| 28 | RUN dnf -y install xorg-x11-server-Xvfb | ||
| 29 | 13 | ||
| 30 | RUN useradd -d /home/developer -m developer | 14 | RUN useradd -d /home/developer -m developer |
| 31 | 15 | ||
| 32 | |||
| 33 | ADD rsyslog.conf /etc/rsyslog.conf | 16 | ADD rsyslog.conf /etc/rsyslog.conf |
| 34 | #Setup cyrus imap | 17 | #Setup cyrus imap |
| 35 | ADD imapd.conf /etc/imapd.conf | 18 | ADD imapd.conf /etc/imapd.conf |