From 882f940be42d243d837a6b1c7f02a32e522f0ce7 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <aschlesinger@deis.com>
Date: Thu, 14 Jan 2016 15:50:20 -0800
Subject: [PATCH 1/4] fix(mc/Dockerfile,rootfs/Dockerfile): switch to
 alpine:3.3

---
 mc/Dockerfile     |  4 ++--
 rootfs/Dockerfile | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/mc/Dockerfile b/mc/Dockerfile
index 6875ac7..6c05d9d 100644
--- a/mc/Dockerfile
+++ b/mc/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu-debootstrap:14.04
+FROM alpine:3.3
 
-RUN apt-get update -y && apt-get install -y -q ca-certificates
+RUN apk add -U ca-certificates && rm -rf /var/cache/apk/*
 
 ADD mc /bin/mc
 
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 6a12fdb..44016e9 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -1,16 +1,10 @@
-FROM ubuntu-debootstrap:14.04
+FROM alpine:3.3
 
 ENV MINIOHOME /home/minio
 ENV MINIOUSER minio
 ENV DEIS_RELEASE=2.0.0-dev
-RUN useradd -m -d $MINIOHOME $MINIOUSER
-
-RUN apt-get update -y && apt-get install -y -q \
-		ca-certificates \
-		yasm
-RUN apt-get update -y && apt-get install -y -q curl
-RUN curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc
-RUN chmod 755 /usr/bin/mc
+RUN adduser -D -h $MINIOHOME $MINIOUSER
+RUN apk add -U ca-certificates yasm curl && rm -rf /var/cache/apk/*
 COPY . /
 USER minio
 RUN mkdir /home/minio/.minio

From d25fafa5924e159413514bbc5c1e6dd1439da861 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <aschlesinger@deis.com>
Date: Thu, 14 Jan 2016 16:28:58 -0800
Subject: [PATCH 2/4] fix(Dockerfile): revert to make minio still run in ubuntu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the minio server can’t currently be compiled with CGO_ENABLED=0
---
 rootfs/Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 44016e9..4a2f239 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -1,11 +1,13 @@
-FROM alpine:3.3
+FROM ubuntu-debootstrap:14.04
 
 ENV MINIOHOME /home/minio
 ENV MINIOUSER minio
 ENV DEIS_RELEASE=2.0.0-dev
-RUN adduser -D -h $MINIOHOME $MINIOUSER
-RUN apk add -U ca-certificates yasm curl && rm -rf /var/cache/apk/*
+RUN useradd -m -d $MINIOHOME $MINIOUSER
+RUN apt-get update -y && apt-get install -y -q ca-certificates curl
+RUN curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc
+RUN chmod 755 /usr/bin/mc
 COPY . /
 USER minio
 RUN mkdir /home/minio/.minio
-ENTRYPOINT ["boot"]
+CMD "boot"

From 2c9a8228d2b9d8d81091bf40b690c716435fafd1 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <aschlesinger@deis.com>
Date: Thu, 14 Jan 2016 16:29:42 -0800
Subject: [PATCH 3/4] fix(Makefile): build mc with CGO off

---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0ba64ea..731c564 100644
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,6 @@ kube-mc-integration:
 build-server:
 	docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.5.2 ./install.sh
 
-# targets for mc
-
 mc-build:
 	make -C mc build
 

From 70611f535a30e89fdd78659db36d1aad1d7eef86 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <aschlesinger@deis.com>
Date: Fri, 15 Jan 2016 10:10:24 -0800
Subject: [PATCH 4/4] fix(mc/Makefile): build mc without cgo

---
 mc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mc/Makefile b/mc/Makefile
index ae848a0..35ba199 100644
--- a/mc/Makefile
+++ b/mc/Makefile
@@ -7,7 +7,7 @@ MC_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION}
 MC_INTEGRATION_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION}
 
 build:
-	docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v ${CURDIR}:/pwd -w /pwd golang:1.5.2 ./install.sh
+	docker run -e CGO_ENABLED=0 -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v ${CURDIR}:/pwd -w /pwd golang:1.5.2 ./install.sh
 
 docker-build:
 	docker build -t ${MC_IMAGE} ${CURDIR}