ci: Enable Fedora30 container, cleanups
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
diff --git a/ci/Dockerfile/fedora30 b/ci/Dockerfile/fedora30
index d30ed26..86efa79 100644
--- a/ci/Dockerfile/fedora30
+++ b/ci/Dockerfile/fedora30
@@ -1,7 +1,8 @@
FROM fedora:30
-RUN dnf -y remove vim-minimal
-RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch zlib-devel zlib-static texinfo perl-bignum "perl(XML::Simple)" "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" libxml2-devel libxslt "perl(ExtUtils::MakeMaker)"
-RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core gawk
-RUN dnf -y install findutils
-RUN dnf -y install ncurses-devel openssl-devel
-RUN dnf -y install rsync
+RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch \
+ zlib-devel zlib-static texinfo "perl(bigint)" "perl(XML::Simple)" \
+ "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" \
+ "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" "perl(ExtUtils::MakeMaker)" \
+ libxml2-devel which wget unzip tar cpio python bzip2 bc findutils ncurses-devel \
+ openssl-devel make libxslt vim-common lzo-devel python2 rsync hostname
+RUN dnf -y install nosync redhat-lsb-core python-matplotlib python-numpy graphviz
diff --git a/ci/Dockerfile/fedora30.ppc64le b/ci/Dockerfile/fedora30.ppc64le
new file mode 120000
index 0000000..eb88330
--- /dev/null
+++ b/ci/Dockerfile/fedora30.ppc64le
@@ -0,0 +1 @@
+fedora30
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804 b/ci/Dockerfile/ubuntu1804
index 49c7b00..91a1e22 100644
--- a/ci/Dockerfile/ubuntu1804
+++ b/ci/Dockerfile/ubuntu1804
@@ -1,10 +1,10 @@
FROM ubuntu:18.04
# Don't ask. Ubuntu is awful.
RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \
- libz-dev libexpat-dev \
- python language-pack-en texinfo \
- build-essential g++ git bison flex unzip gawk \
- cpio vim-common lsb-release \
- libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \
- wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata bsdmainutils rsync
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags libz-dev libexpat-dev \
+ python language-pack-en texinfo gawk cpio xxd \
+ build-essential g++ git bison flex unzip \
+ libssl-dev libxml-simple-perl libxml-sax-perl libxml-parser-perl libxml2-dev libxml2-utils xsltproc \
+ wget bc rsync
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install eatmydata python-matplotlib \
+ python-numpy graphviz bsdmainutils lsb-release