Extend httpredir workaround to all images

Difficulty was also experienced with the base image
This commit is contained in:
Matt McCormick 2016-07-15 12:50:15 -04:00
parent 197350dbb6
commit d5c20e773a
3 changed files with 6 additions and 10 deletions

View File

@ -1,6 +1,12 @@
FROM debian:jessie FROM debian:jessie
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" 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@<http://\(.*\)/debian/>;@\1@g'`/" /etc/apt/sources.list
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
automake \ automake \
autogen \ autogen \

View File

@ -1,11 +1,6 @@
FROM thewtex/cross-compiler-base FROM thewtex/cross-compiler-base
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" 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@<http://\(.*\)/debian/>;@\1@g'`/" /etc/apt/sources.list
# WINE is used as an emulator for try_run and tests with CMake. # WINE is used as an emulator for try_run and tests with CMake.
# Other dependencies are from the listed MXE requirements: # Other dependencies are from the listed MXE requirements:
# http://mxe.cc/#requirements # http://mxe.cc/#requirements

View File

@ -1,11 +1,6 @@
FROM thewtex/cross-compiler-base FROM thewtex/cross-compiler-base
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" 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@<http://\(.*\)/debian/>;@\1@g'`/" /etc/apt/sources.list
# WINE is used as an emulator for try_run and tests with CMake. # WINE is used as an emulator for try_run and tests with CMake.
# Other dependencies are from the listed MXE requirements: # Other dependencies are from the listed MXE requirements:
# http://mxe.cc/#requirements # http://mxe.cc/#requirements