From 55436e6348688506f27442427f3b3de37e07e31b Mon Sep 17 00:00:00 2001 From: Ying Li Date: Thu, 7 Apr 2016 14:09:27 -0700 Subject: [PATCH 1/2] Do not install go vet on the Dockerfile, as it should already be in the image, and godeps no longer necessary Signed-off-by: Ying Li --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00d93ebb84..3c1a593b97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,9 +11,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && rm -rf /var/lib/apt/lists/* -RUN go get golang.org/x/tools/cmd/vet \ - && go get golang.org/x/tools/cmd/cover \ - && go get github.com/tools/godep +RUN go get golang.org/x/tools/cmd/cover # Configure the container for OSX cross compilation ENV OSX_SDK MacOSX10.11.sdk From 4301c3f402c8c056e9522bc06f0e27f4a6958cb4 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Thu, 7 Apr 2016 14:09:57 -0700 Subject: [PATCH 2/2] Pin the version of oscross, similarly to docker/docker Signed-off-by: Ying Li --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c1a593b97..1de431a684 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,10 +15,12 @@ RUN go get golang.org/x/tools/cmd/cover # Configure the container for OSX cross compilation ENV OSX_SDK MacOSX10.11.sdk +ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4 RUN set -x \ && export OSXCROSS_PATH="/osxcross" \ - && git clone --depth 1 https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \ - && curl -sSL https://s3.dockerproject.org/darwin/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \ + && git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \ + && ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \ + && curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \ && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh ENV PATH /osxcross/target/bin:$PATH