diff --git a/scripts/build/docker/Dockerfile-i686 b/scripts/build/docker/Dockerfile-i686 index 2dc475a8..b85ed694 100644 --- a/scripts/build/docker/Dockerfile-i686 +++ b/scripts/build/docker/Dockerfile-i686 @@ -1,8 +1,14 @@ FROM erwinchang/ubuntu-12.04-32bit-build +# Setup APT sources + +RUN sed s,ubuntu\.stu\.edu\.tw,archive.ubuntu.com, /etc/apt/sources.list > /tmp/sources.list \ + && mv /tmp/sources.list /etc/apt/sources.list + + + # Install dependencies -RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y \ build-essential \ curl \ diff --git a/scripts/build/docker/Dockerfile-x86_64 b/scripts/build/docker/Dockerfile-x86_64 index a340ebd6..4e988010 100644 --- a/scripts/build/docker/Dockerfile-x86_64 +++ b/scripts/build/docker/Dockerfile-x86_64 @@ -1,8 +1,13 @@ FROM ubuntu:12.04 +# Setup APT sources + + +RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list + + # Install dependencies -RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y \ build-essential \ curl \ diff --git a/scripts/build/docker/Dockerfile.template b/scripts/build/docker/Dockerfile.template index e177b625..10074f2b 100644 --- a/scripts/build/docker/Dockerfile.template +++ b/scripts/build/docker/Dockerfile.template @@ -1,8 +1,16 @@ FROM <%= image %> +# Setup APT sources +<% if (architecture == 'i686') { %> +RUN sed s,ubuntu\.stu\.edu\.tw,archive.ubuntu.com, /etc/apt/sources.list > /tmp/sources.list \ + && mv /tmp/sources.list /etc/apt/sources.list +<% } %> +<% if (architecture == 'x86_64') { %> +RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list +<% } %> + # Install dependencies -RUN echo "deb http://archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse" >> /etc/apt/sources.list \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y \ build-essential \ curl \