From fb9c82db1c24bdd4c24e85c309e8d121a11d0fd3 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 5 Apr 2016 14:17:23 -0600 Subject: [PATCH 1/4] fix(Dockerfile): update location of "mc" binary --- boot.go | 2 +- rootfs/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.go b/boot.go index 54977b7..6dd5058 100644 --- a/boot.go +++ b/boot.go @@ -40,7 +40,7 @@ const configdir = "/home/minio/.minio/" const templv3 = `{ "version": "3", "alias": { - "dl": "https://dl.minio.io:9000", + "dl": "https://dl.minio.io", "localhost": "http://localhost:9000", "play": "https://play.minio.io:9000", "s3": "https://s3.amazonaws.com" diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 508bd40..c6e7fe1 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -5,9 +5,9 @@ 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 curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.OFFICIAL.2015-09-05T23-43-46Z -o /usr/bin/mc RUN chmod 755 /usr/bin/mc COPY . / USER minio RUN mkdir /home/minio/.minio -CMD "boot" +CMD ["/bin/boot"] From 6d5af58b92e4a02997d17defe8840da37dc7d8f0 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 12 Apr 2016 12:29:47 -0600 Subject: [PATCH 2/4] fix(server/install.sh): don't get "go vet" package --- server/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/install.sh b/server/install.sh index 304506c..24f8c42 100755 --- a/server/install.sh +++ b/server/install.sh @@ -15,5 +15,7 @@ cd $GOPATH/src/github.com/minio git clone -b master --single-branch https://github.com/minio/minio.git minio cd minio git reset --hard 356b889 +# HACK remove the "go vet" installation line +sed -i.bak '63 d' Makefile make install cp $GOPATH/bin/minio /pwd/minio From 1c3097ce9bcdcb3f97f7570b884208232d8ba176 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 12 Apr 2016 12:53:12 -0600 Subject: [PATCH 3/4] fix(Makefile): add "build" to "docker-build" target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a3cd2a..47f7e9e 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ build: test: ${DEV_ENV_CMD} go test ${TEST_PACKAGES} -docker-build: build-server +docker-build: 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} From 8e5f5f40e0d1b2ebfbe2439ad158478c0aa0779f Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 12 Apr 2016 14:13:53 -0600 Subject: [PATCH 4/4] fix(glide): revert to last-known-good version of deis/pkg/aboutme --- glide.lock | 2 +- glide.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 864f390..8df7983 100644 --- a/glide.lock +++ b/glide.lock @@ -14,7 +14,7 @@ imports: subpackages: - spew - name: github.com/deis/pkg - version: 20cd6d3875d29b186b47d7466dcc1672db01619c + version: f63d9718b86f17c9320f838fb3eb6039cadb9691 subpackages: - aboutme - utils diff --git a/glide.yaml b/glide.yaml index 6463eba..bc69990 100644 --- a/glide.yaml +++ b/glide.yaml @@ -16,7 +16,7 @@ import: - package: gopkg.in/yaml.v2 version: a83829b6f1293c91addabc89d0571c246397bbf4 - package: github.com/deis/pkg - version: v0.4.0 + version: f63d9718b86f17c9320f838fb3eb6039cadb9691 subpackages: - /aboutme - /utils