Merge pull request #2733 from stewart-ibm/ci-distro-bump
Ci distro bump
diff --git a/README.md b/README.md
index d19cff1..0c1ecb3 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,12 @@
process, so you don't need to worry about setting up a
cross-compiler. Cross-compiling from a x86-64 host is officially supported.
+The machine your building on will need Python 2.7, GCC 6.2 (or later), and
+a handful of other packages (see below).
+
### Dependencies for *64-bit* Ubuntu/Debian systems
-1. Install Ubuntu (>= 14.04) or Debian (>= 7.5) 64-bit.
+1. Install Ubuntu (>= 18.04) or Debian (>= 7.5) 64-bit.
2. Enable Universe (Ubuntu only):
sudo apt-get install software-properties-common
@@ -56,7 +59,7 @@
python language-pack-en texinfo \
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
+ wget bc rsync
### Dependencies for *64-bit* Fedora systems
diff --git a/ci/Dockerfile/fedora27.x86_64 b/ci/Dockerfile/fedora27.x86_64
deleted file mode 120000
index 7c4b5e7..0000000
--- a/ci/Dockerfile/fedora27.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora27
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora27 b/ci/Dockerfile/fedora29
similarity index 96%
rename from ci/Dockerfile/fedora27
rename to ci/Dockerfile/fedora29
index ff77500..9ee2680 100644
--- a/ci/Dockerfile/fedora27
+++ b/ci/Dockerfile/fedora29
@@ -1,4 +1,4 @@
-FROM fedora:27
+FROM fedora:29
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
diff --git a/ci/Dockerfile/fedora29.x86_64 b/ci/Dockerfile/fedora29.x86_64
new file mode 120000
index 0000000..597c14e
--- /dev/null
+++ b/ci/Dockerfile/fedora29.x86_64
@@ -0,0 +1 @@
+fedora29
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le
deleted file mode 120000
index 174b820..0000000
--- a/ci/Dockerfile/ubuntu1604.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604.x86_64 b/ci/Dockerfile/ubuntu1604.x86_64
deleted file mode 120000
index 174b820..0000000
--- a/ci/Dockerfile/ubuntu1604.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1604
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1804
similarity index 91%
rename from ci/Dockerfile/ubuntu1604
rename to ci/Dockerfile/ubuntu1804
index 5c05411..a4a9f30 100644
--- a/ci/Dockerfile/ubuntu1604
+++ b/ci/Dockerfile/ubuntu1804
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+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 \
@@ -7,4 +7,4 @@
build-essential g++ git bison flex unzip \
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
+ wget bc libssl-dev python-matplotlib python-numpy graphviz eatmydata bsdmainutils rsync
diff --git a/ci/Dockerfile/ubuntu1804.ppc64le b/ci/Dockerfile/ubuntu1804.ppc64le
new file mode 120000
index 0000000..967c573
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1804.ppc64le
@@ -0,0 +1 @@
+ubuntu1804
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804.x86_64 b/ci/Dockerfile/ubuntu1804.x86_64
new file mode 120000
index 0000000..967c573
--- /dev/null
+++ b/ci/Dockerfile/ubuntu1804.x86_64
@@ -0,0 +1 @@
+ubuntu1804
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index 9359ca6..f03b1fb 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-CONTAINERS="ubuntu1604 fedora27"
+CONTAINERS="ubuntu1804 fedora29"
SDK_ONLY=0
@@ -101,10 +101,10 @@
HTTPS_PROXY_ENV="ENV https_proxy $HTTPS_PROXY"
fi
if [[ -n "$http_proxy" ]]; then
- if [[ "$distro" == fedora27 ]]; then
+ if [[ "$distro" == fedora29 ]]; then
PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf"
fi
- if [[ "$distro" == ubuntu1604 ]]; then
+ if [[ "$distro" == ubuntu1804 ]]; then
PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
fi
fi