diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-01-16 16:07:49 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-02-12 10:24:05 +1100 |
| commit | 915cea18e7618a884fc96f064e0ee980515dbcc9 (patch) | |
| tree | 644a327ef3fa4bd43349942a136185372c86bf8c /ci/Dockerfile | |
| parent | 98d7413f1d885a437a5a0a2f30ceb9c2cce9083b (diff) | |
| download | blackbird-op-build-915cea18e7618a884fc96f064e0ee980515dbcc9.tar.gz blackbird-op-build-915cea18e7618a884fc96f064e0ee980515dbcc9.zip | |
Update ci/ Dockerfiles to Fedora 27/Ubuntu 16.04LTS
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'ci/Dockerfile')
| l--------- | ci/Dockerfile/fedora25.x86_64 | 1 | ||||
| -rw-r--r-- | ci/Dockerfile/fedora27 (renamed from ci/Dockerfile/fedora25) | 2 | ||||
| l--------- | ci/Dockerfile/fedora27.x86_64 | 1 | ||||
| l--------- | ci/Dockerfile/ubuntu1404.ppc64le | 1 | ||||
| l--------- | ci/Dockerfile/ubuntu1404.x86_64 | 1 | ||||
| -rw-r--r-- | ci/Dockerfile/ubuntu1604 (renamed from ci/Dockerfile/ubuntu1404) | 10 | ||||
| l--------- | ci/Dockerfile/ubuntu1604.ppc64le | 1 | ||||
| l--------- | ci/Dockerfile/ubuntu1604.x86_64 | 1 |
8 files changed, 9 insertions, 9 deletions
diff --git a/ci/Dockerfile/fedora25.x86_64 b/ci/Dockerfile/fedora25.x86_64 deleted file mode 120000 index c6db8fce..00000000 --- a/ci/Dockerfile/fedora25.x86_64 +++ /dev/null @@ -1 +0,0 @@ -fedora25
\ No newline at end of file diff --git a/ci/Dockerfile/fedora25 b/ci/Dockerfile/fedora27 index 433f9484..ff77500e 100644 --- a/ci/Dockerfile/fedora25 +++ b/ci/Dockerfile/fedora27 @@ -1,4 +1,4 @@ -FROM fedora:25 +FROM fedora:27 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/fedora27.x86_64 b/ci/Dockerfile/fedora27.x86_64 new file mode 120000 index 00000000..7c4b5e7e --- /dev/null +++ b/ci/Dockerfile/fedora27.x86_64 @@ -0,0 +1 @@ +fedora27
\ No newline at end of file diff --git a/ci/Dockerfile/ubuntu1404.ppc64le b/ci/Dockerfile/ubuntu1404.ppc64le deleted file mode 120000 index 529a5fa5..00000000 --- a/ci/Dockerfile/ubuntu1404.ppc64le +++ /dev/null @@ -1 +0,0 @@ -ubuntu1404
\ No newline at end of file diff --git a/ci/Dockerfile/ubuntu1404.x86_64 b/ci/Dockerfile/ubuntu1404.x86_64 deleted file mode 120000 index 529a5fa5..00000000 --- a/ci/Dockerfile/ubuntu1404.x86_64 +++ /dev/null @@ -1 +0,0 @@ -ubuntu1404
\ No newline at end of file diff --git a/ci/Dockerfile/ubuntu1404 b/ci/Dockerfile/ubuntu1604 index b3833c9a..46f68014 100644 --- a/ci/Dockerfile/ubuntu1404 +++ b/ci/Dockerfile/ubuntu1604 @@ -1,10 +1,10 @@ -FROM ubuntu:14.04 +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 -RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags \ +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 \ - libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc -RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy wget bc libssl-dev + cpio vim-common lsb-release \ + libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc \ + wget bc libssl-dev diff --git a/ci/Dockerfile/ubuntu1604.ppc64le b/ci/Dockerfile/ubuntu1604.ppc64le new file mode 120000 index 00000000..174b820a --- /dev/null +++ b/ci/Dockerfile/ubuntu1604.ppc64le @@ -0,0 +1 @@ +ubuntu1604
\ No newline at end of file diff --git a/ci/Dockerfile/ubuntu1604.x86_64 b/ci/Dockerfile/ubuntu1604.x86_64 new file mode 120000 index 00000000..174b820a --- /dev/null +++ b/ci/Dockerfile/ubuntu1604.x86_64 @@ -0,0 +1 @@ +ubuntu1604
\ No newline at end of file |
