From d5c20e773ab0c07ba92ed241eafb09b0aac7e1af Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 15 Jul 2016 12:50:15 -0400 Subject: [PATCH] Extend httpredir workaround to all images Difficulty was also experienced with the base image --- Dockerfile | 6 ++++++ windows-x64/Dockerfile | 5 ----- windows-x86/Dockerfile | 5 ----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ff338d..4a85fff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,12 @@ FROM debian:jessie MAINTAINER Matt McCormick "matt.mccormick@kitware.com" +# Insert this line before "RUN apt-get update" to dynamically +# replace httpredir.debian.org with a single working domain +# in attempt to "prevent" the "Error reading from server" error. +RUN apt-get update && apt-get install -y curl && \ + sed -i "s/httpredir.debian.org/`curl -s -D - http://httpredir.debian.org/demo/debian/ | awk '/^Link:/ { print $2 }' | sed -e 's@;@\1@g'`/" /etc/apt/sources.list + RUN apt-get update && apt-get -y install \ automake \ autogen \ diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile index a874646..175416d 100644 --- a/windows-x64/Dockerfile +++ b/windows-x64/Dockerfile @@ -1,11 +1,6 @@ FROM thewtex/cross-compiler-base MAINTAINER Matt McCormick "matt.mccormick@kitware.com" -# Insert this line before "RUN apt-get update" to dynamically -# replace httpredir.debian.org with a single working domain -# in attempt to "prevent" the "Error reading from server" error. -RUN sed -i "s/httpredir.debian.org/`curl -s -D - http://httpredir.debian.org/demo/debian/ | awk '/^Link:/ { print $2 }' | sed -e 's@;@\1@g'`/" /etc/apt/sources.list - # WINE is used as an emulator for try_run and tests with CMake. # Other dependencies are from the listed MXE requirements: # http://mxe.cc/#requirements diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile index 39cfc76..ea38312 100644 --- a/windows-x86/Dockerfile +++ b/windows-x86/Dockerfile @@ -1,11 +1,6 @@ FROM thewtex/cross-compiler-base MAINTAINER Matt McCormick "matt.mccormick@kitware.com" -# Insert this line before "RUN apt-get update" to dynamically -# replace httpredir.debian.org with a single working domain -# in attempt to "prevent" the "Error reading from server" error. -RUN sed -i "s/httpredir.debian.org/`curl -s -D - http://httpredir.debian.org/demo/debian/ | awk '/^Link:/ { print $2 }' | sed -e 's@;@\1@g'`/" /etc/apt/sources.list - # WINE is used as an emulator for try_run and tests with CMake. # Other dependencies are from the listed MXE requirements: # http://mxe.cc/#requirements