diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-03-27 14:49:52 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-03-28 10:49:05 +1100 |
| commit | a640da14fd6d5810711c5bf05e72e7dd43f8e602 (patch) | |
| tree | d9a1b4b1e637fe3baad2b6cfd9c88268571b3a75 /ci | |
| parent | 26b9f99e7562ed2e650a8e8c28a1a9c9f8addf60 (diff) | |
| download | talos-op-build-a640da14fd6d5810711c5bf05e72e7dd43f8e602.tar.gz talos-op-build-a640da14fd6d5810711c5bf05e72e7dd43f8e602.zip | |
ci: Bump fedora to Fedora 29
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'ci')
| l--------- | ci/Dockerfile/fedora27.x86_64 | 1 | ||||
| -rw-r--r-- | ci/Dockerfile/fedora29 (renamed from ci/Dockerfile/fedora27) | 2 | ||||
| l--------- | ci/Dockerfile/fedora29.x86_64 | 1 | ||||
| -rwxr-xr-x | ci/build.sh | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ci/Dockerfile/fedora27.x86_64 b/ci/Dockerfile/fedora27.x86_64 deleted file mode 120000 index 7c4b5e7e..00000000 --- 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 index ff77500e..9ee2680a 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 00000000..597c14ef --- /dev/null +++ b/ci/Dockerfile/fedora29.x86_64 @@ -0,0 +1 @@ +fedora29
\ No newline at end of file diff --git a/ci/build.sh b/ci/build.sh index 8a275f31..f03b1fb0 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -CONTAINERS="ubuntu1804 fedora27" +CONTAINERS="ubuntu1804 fedora29" SDK_ONLY=0 @@ -101,7 +101,7 @@ do 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" == ubuntu1804 ]]; then |
