From d28618581890c579a1275150e5adc7eec61eda6b Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Tue, 14 Jul 2015 15:52:02 +0200 Subject: [PATCH] Install bzr and avoid doing the sed for read. bzr is needed for dependencies like labix.org/mgo that use bzr for source control. The sed that comments out the read commands have caused issues for me. Using the UNATTENDED option seems more natural. --- docker/base/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index a110844..d9f2145 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -24,7 +24,7 @@ RUN \ apt-get install -y automake autogen build-essential ca-certificates \ gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-multilib gcc-mingw-w64 \ clang llvm-dev libtool libxml2-dev uuid-dev libssl-dev pkg-config \ - patch make xz-utils cpio wget unzip git mercurial --no-install-recommends + patch make xz-utils cpio wget unzip git mercurial bzr --no-install-recommends # Configure the container for OSX cross compilation ENV OSX_SDK_PATH https://github.com/trevd/android_platform_build2/raw/master/osxsdks10.6.tar.gz @@ -32,14 +32,15 @@ ENV OSX_SDK MacOSX10.6.sdk RUN \ git clone https://github.com/tpoechtrager/osxcross.git && \ - sed -i.bak s/read/#read/g /osxcross/build.sh && \ \ - $FETCH $OSX_SDK_PATH f526b4ae9806e8d31e3b094e3f004f8f160a3fad && \ + $FETCH $OSX_SDK_PATH f526b4ae9806e8d31e3b094e3f004f8f160a3fad + +RUN \ tar -xzf `basename $OSX_SDK_PATH` --strip-components 1 SDKs/$OSX_SDK && \ tar -cjf /osxcross/tarballs/$OSX_SDK.tar.bz2 $OSX_SDK && \ rm -rf `basename $OSX_SDK_PATH` $OSX_SDK && \ \ - /osxcross/build.sh + UNATTENDED=yes /osxcross/build.sh ENV PATH /osxcross/target/bin:$PATH