From 1b526d85edb24f707e137167c66317fb2b07e5b3 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Thu, 5 Apr 2018 08:49:51 +1000 Subject: travis: add -L to all curl invocations to follow redirects Signed-off-by: Stewart Smith --- opal-ci/Dockerfile-centos6 | 2 +- opal-ci/Dockerfile-centos7 | 4 ++-- opal-ci/Dockerfile-debian-stretch | 2 +- opal-ci/Dockerfile-debian-unstable | 4 ++-- opal-ci/Dockerfile-docs | 5 +++++ opal-ci/Dockerfile-ubuntu-12.04 | 6 +++--- opal-ci/Dockerfile-ubuntu-16.04 | 4 ++-- opal-ci/Dockerfile-ubuntu-latest | 4 ++-- 8 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 opal-ci/Dockerfile-docs diff --git a/opal-ci/Dockerfile-centos6 b/opal-ci/Dockerfile-centos6 index 3c88b27a..de6f2bc7 100644 --- a/opal-ci/Dockerfile-centos6 +++ b/opal-ci/Dockerfile-centos6 @@ -4,7 +4,7 @@ RUN yum -y install wget curl xterm gcc git xz ccache dtc openssl-devel RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN mkdir /opt/cross RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el6.x86_64.rpm +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el6.x86_64.rpm RUN yum -y install systemsim-p8-1.0-2.el6.x86_64.rpm COPY . /build/ WORKDIR /build diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 index 7fd8c6cb..be6f6a33 100644 --- a/opal-ci/Dockerfile-centos7 +++ b/opal-ci/Dockerfile-centos7 @@ -4,9 +4,9 @@ RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect va RUN wget https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN mkdir /opt/cross RUN tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm RUN yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm RUN yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm RUN yum install -y flex bison RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz - diff --git a/opal-ci/Dockerfile-debian-stretch b/opal-ci/Dockerfile-debian-stretch index 73387174..780f92b2 100644 --- a/opal-ci/Dockerfile-debian-stretch +++ b/opal-ci/Dockerfile-debian-stretch @@ -4,7 +4,7 @@ RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev RUN apt-get install -y wget xterm curl device-tree-compiler RUN apt-get install -y gcc-arm-linux-gnueabi RUN apt-get install -y libtcl8.6 -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable index 0562d09d..c193dda2 100644 --- a/opal-ci/Dockerfile-debian-unstable +++ b/opal-ci/Dockerfile-debian-unstable @@ -3,10 +3,10 @@ RUN apt-get update -qq RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev RUN apt-get install -y wget xterm curl device-tree-compiler RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -L -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get install -y libtcl8.6 -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb RUN dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs new file mode 100644 index 00000000..0ebd3919 --- /dev/null +++ b/opal-ci/Dockerfile-docs @@ -0,0 +1,5 @@ +FROM fedora:27 +RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel +COPY . /build/ +WORKDIR /build +ENTRYPOINT ./opal-ci/build-docs.sh diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04 index fc537284..186d92fb 100644 --- a/opal-ci/Dockerfile-ubuntu-12.04 +++ b/opal-ci/Dockerfile-ubuntu-12.04 @@ -7,13 +7,13 @@ RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache expe RUN sudo apt-get install -y gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 RUN sudo apt-get install -y wget curl -RUN curl -O https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz +RUN curl -L -O https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.8.0/x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz RUN sudo mkdir /opt/cross RUN sudo tar -C /opt/cross -xf x86_64-gcc-4.8.0-nolibc_powerpc64-linux.tar.xz -RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -L -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN sudo dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get install -y libtcl8.6 -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb RUN sudo dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb RUN sudo apt-get -y install eatmydata RUN sudo eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04 index e7a64678..40239ecf 100644 --- a/opal-ci/Dockerfile-ubuntu-16.04 +++ b/opal-ci/Dockerfile-ubuntu-16.04 @@ -3,10 +3,10 @@ RUN apt-get update -qq RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev RUN apt-get install -y wget curl xterm device-tree-compiler RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -L -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get install -y libtcl8.6 -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb RUN dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index 8e1aa51b..dbdab2e1 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -3,10 +3,10 @@ RUN apt-get update -qq RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect libssl-dev RUN apt-get install -y wget xterm curl device-tree-compiler RUN apt-get install -y gcc-arm-linux-gnueabi -RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb +RUN curl -L -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb RUN dpkg -i systemsim-p8_1.0-2_amd64.deb RUN apt-get install -y libtcl8.6 -RUN curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb +RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb RUN dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb RUN apt-get -y install eatmydata RUN eatmydata apt-get -y install build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind -- cgit v1.2.1