From b106ebac320fe6cd4ad7dc0a85fa339071a2c881 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <aschlesinger@deis.com>
Date: Thu, 18 Feb 2016 10:55:33 -0800
Subject: [PATCH] chore(Makefile,rootfs/Dockerfile,server/install.sh): use
 official minio release

---
 Makefile          | 10 +---------
 rootfs/Dockerfile | 10 ++++++----
 server/install.sh | 17 -----------------
 3 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100755 server/install.sh

diff --git a/Makefile b/Makefile
index af3d76c..a043af2 100644
--- a/Makefile
+++ b/Makefile
@@ -44,11 +44,7 @@ build:
 test:
 	${DEV_ENV_CMD} go test ${TEST_PACKAGES}
 
-docker-build: build-server
-	# copy the server binary from where it was built to the final image's file system.
-	# note that the minio server is built as a dependency of this build target.
-	cp server/minio ${BINDIR}
-
+docker-build:
 	# build the main image
 	docker build --rm -t ${IMAGE} rootfs
 	# These are both YAML specific
@@ -98,10 +94,6 @@ kube-mc:
 kube-mc-integration:
 	kubectl create -f manifests/deis-mc-integration-pod.yaml
 
-# build the minio server
-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
-
 mc-build:
 	make -C mc build
 
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 508bd40..fab8c2a 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -3,10 +3,12 @@ FROM ubuntu:14.04
 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 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 useradd -m -d $MINIOHOME $MINIOUSER && \
+    apt-get update -y && \
+    apt-get install -y -q ca-certificates curl && \
+    curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc && \
+    chmod 755 /usr/bin/mc && \
+    curl -f -SL https://dl.minio.io/server/minio/release/linux-amd64/minio.OFFICIAL.2016-02-08T00-12-28Z -o /bin/minio
 COPY . /
 USER minio
 RUN mkdir /home/minio/.minio
diff --git a/server/install.sh b/server/install.sh
deleted file mode 100755
index a2ce2d2..0000000
--- a/server/install.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script builds the minio server (https://github.com/minio/minio) inside a Docker container. It should be run inside a golang:1.5.2 container, with the following environment variables set.
-#
-# - GOROOT=/usr/local/go
-# - GO15VENDOREXPERIMENT=1
-#
-# It also expects the current directory (mc/) to be mounted at /pwd, and for /pwd to be the current working directory
-#
-# See the 'mc' build target in the Makefile (in the parent directory) for an example of how to use this script.
-
-mkdir -p $GOPATH/src/github.com/minio
-cd $GOPATH/src/github.com/minio
-curl -L -O -s https://github.com/minio/minio/archive/master.tar.gz && tar -xvzf master.tar.gz && rm master.tar.gz && mv minio-master minio
-cd minio
-make install
-cp $GOPATH/bin/minio /pwd/minio