diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-02-16 14:41:10 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-02-16 14:41:12 +1100 |
commit | 6650dd405011bc2e4ca49afb5d33e57005a1df65 (patch) | |
tree | 3590c417dbe74ed806be73515c315e8ba6ae8f01 /ci | |
parent | 11417f3e2a21429e34b9b5240fe6188ced5424a9 (diff) | |
download | talos-op-build-6650dd405011bc2e4ca49afb5d33e57005a1df65.tar.gz talos-op-build-6650dd405011bc2e4ca49afb5d33e57005a1df65.zip |
ci: use fedora 25 instead of fedora23
Fedora 23 is no longer supported. Current release is Fedora 25
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'ci')
l--------- | ci/Dockerfile/fedora23.x86_64 | 1 | ||||
-rw-r--r-- | ci/Dockerfile/fedora25 (renamed from ci/Dockerfile/fedora23) | 2 | ||||
l--------- | ci/Dockerfile/fedora25.x86_64 | 1 | ||||
-rwxr-xr-x | ci/build.sh | 13 |
4 files changed, 12 insertions, 5 deletions
diff --git a/ci/Dockerfile/fedora23.x86_64 b/ci/Dockerfile/fedora23.x86_64 deleted file mode 120000 index 5322ce73..00000000 --- a/ci/Dockerfile/fedora23.x86_64 +++ /dev/null @@ -1 +0,0 @@ -fedora23
\ No newline at end of file diff --git a/ci/Dockerfile/fedora23 b/ci/Dockerfile/fedora25 index ed50956e..9414efc3 100644 --- a/ci/Dockerfile/fedora23 +++ b/ci/Dockerfile/fedora25 @@ -1,4 +1,4 @@ -FROM fedora:23 +FROM fedora:25 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/fedora25.x86_64 b/ci/Dockerfile/fedora25.x86_64 new file mode 120000 index 00000000..c6db8fce --- /dev/null +++ b/ci/Dockerfile/fedora25.x86_64 @@ -0,0 +1 @@ +fedora25
\ No newline at end of file diff --git a/ci/build.sh b/ci/build.sh index 64b862d4..0ace0e1a 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,6 +1,8 @@ #!/bin/bash -while getopts ":ahp:" opt; do +CONTAINERS="ubuntu1404 fedora25" + +while getopts ":ahp:c:" opt; do case $opt in a) echo "Build firmware images for all the platforms" @@ -10,11 +12,16 @@ while getopts ":ahp:" opt; do echo "Build firmware images for the platforms: $OPTARG" PLATFORMS=$OPTARG ;; + c) + echo "Build in container: $OPTARG" + CONTAINERS=$OPTARG + ;; h) echo "Usage: ./ci/build.sh [options] [--]" echo "-h Print this help and exit successfully." echo "-a Build firmware images for all the platform defconfig's." echo "-p List of comma separated platform names to build images for particular platforms." + echo "-c Container to run in" echo "Example:DOCKER_PREFIX=sudo ./ci/build.sh -a" echo -e "\tDOCKER_PREFIX=sudo ./ci/build.sh -p firestone" echo -e "\tDOCKER_PREFIX=sudo ./ci/build.sh -p garrison,palmetto,openpower_p9_mambo" @@ -48,7 +55,7 @@ if [ -d output-images ]; then exit 1; fi -for distro in ubuntu1404 fedora23; +for distro in $CONTAINERS; do base_dockerfile=ci/Dockerfile/$distro.`arch` if [ ! -f $base_dockerfile ]; then @@ -59,7 +66,7 @@ do http_proxy=$HTTP_PROXY fi if [[ -n "$http_proxy" ]]; then - if [[ "$distro" == fedora23 ]]; then + if [[ "$distro" == fedora25 ]]; then PROXY="RUN echo \"proxy=${http_proxy}\" >> /etc/dnf/dnf.conf" fi if [[ "$distro" == ubuntu1404 ]]; then |