From 26b9f99e7562ed2e650a8e8c28a1a9c9f8addf60 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Wed, 27 Mar 2019 14:46:49 +1100 Subject: ci: Use Ubuntu 18.04 rather than Ubuntu 16.04 We will soon require Ubuntu 18.04 rather than Ubuntu 16.04 for building op-build due to a GCC6.2 requirement from glibc. Signed-off-by: Stewart Smith --- ci/Dockerfile/ubuntu1604 | 10 ---------- ci/Dockerfile/ubuntu1604.ppc64le | 1 - ci/Dockerfile/ubuntu1604.x86_64 | 1 - ci/Dockerfile/ubuntu1804 | 10 ++++++++++ ci/Dockerfile/ubuntu1804.ppc64le | 1 + ci/Dockerfile/ubuntu1804.x86_64 | 1 + 6 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 ci/Dockerfile/ubuntu1604 delete mode 120000 ci/Dockerfile/ubuntu1604.ppc64le delete mode 120000 ci/Dockerfile/ubuntu1604.x86_64 create mode 100644 ci/Dockerfile/ubuntu1804 create mode 120000 ci/Dockerfile/ubuntu1804.ppc64le create mode 120000 ci/Dockerfile/ubuntu1804.x86_64 (limited to 'ci/Dockerfile') diff --git a/ci/Dockerfile/ubuntu1604 b/ci/Dockerfile/ubuntu1604 deleted file mode 100644 index 5c054115..00000000 --- a/ci/Dockerfile/ubuntu1604 +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:16.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 \ - 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 diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le deleted file mode 120000 index 174b820a..00000000 --- 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 174b820a..00000000 --- a/ci/Dockerfile/ubuntu1604.x86_64 +++ /dev/null @@ -1 +0,0 @@ -ubuntu1604 \ No newline at end of file diff --git a/ci/Dockerfile/ubuntu1804 b/ci/Dockerfile/ubuntu1804 new file mode 100644 index 00000000..a4a9f30b --- /dev/null +++ b/ci/Dockerfile/ubuntu1804 @@ -0,0 +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 \ + 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 diff --git a/ci/Dockerfile/ubuntu1804.ppc64le b/ci/Dockerfile/ubuntu1804.ppc64le new file mode 120000 index 00000000..967c5733 --- /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 00000000..967c5733 --- /dev/null +++ b/ci/Dockerfile/ubuntu1804.x86_64 @@ -0,0 +1 @@ +ubuntu1804 \ No newline at end of file -- cgit v1.2.1