diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-03-27 14:46:49 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-28 10:49:05 +1100 |
| commit | 26b9f99e7562ed2e650a8e8c28a1a9c9f8addf60 (patch) | |
| tree | bb91cf81bcf5aa3c5f1026bac78ae4b4c4ae61ef /ci/Dockerfile | |
| parent | 1a03672434bed0ff019c1e6b97782eb5ec81c731 (diff) | |
| download | blackbird-op-build-26b9f99e7562ed2e650a8e8c28a1a9c9f8addf60.tar.gz blackbird-op-build-26b9f99e7562ed2e650a8e8c28a1a9c9f8addf60.zip | |
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 <stewart@linux.ibm.com>
Diffstat (limited to 'ci/Dockerfile')
| l--------- | ci/Dockerfile/ubuntu1604.ppc64le | 1 | ||||
| l--------- | ci/Dockerfile/ubuntu1604.x86_64 | 1 | ||||
| -rw-r--r-- | ci/Dockerfile/ubuntu1804 (renamed from ci/Dockerfile/ubuntu1604) | 4 | ||||
| l--------- | ci/Dockerfile/ubuntu1804.ppc64le | 1 | ||||
| l--------- | ci/Dockerfile/ubuntu1804.x86_64 | 1 |
5 files changed, 4 insertions, 4 deletions
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/ubuntu1604 b/ci/Dockerfile/ubuntu1804 index 5c054115..a4a9f30b 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 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteract 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 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 |
