From 8d71e7de4eb6b4f6939fced885173f30aac7982f Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Wed, 7 Nov 2018 00:33:19 +0800 Subject: [PATCH 1/4] feat(minio): update to the latest minio --- rootfs/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 45f639b..8e237a9 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -9,11 +9,11 @@ RUN adduser --system \ COPY . / -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 curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2018-11-06T01-12-20Z -o /usr/bin/mc \ && chmod 755 /usr/bin/mc \ && mkdir /home/minio/.minio \ && chown minio:minio /home/minio/.minio -ADD https://dl.minio.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2016-06-03T19-32-05Z /bin/minio +ADD https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2018-11-06T01-01-02Z /bin/minio RUN chmod 755 /bin/minio USER minio From 3798c6296a8a0c97f446fc06b8c6c4d7fc24ea8c Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Tue, 6 Nov 2018 17:20:24 +0000 Subject: [PATCH 2/4] chore(minio): adding travis.yml --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2b16c97 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +sudo: required +language: go +services: +- docker +script: make bootstrap glideup build test-cover +notifications: + slack: + secure: pWDCV3od8gxvzxh9DrOTvBL54XoCfWYhZZlwd2ZbyyOz6SS12Psg/ZuCT2253p4yMfF/LPlsz76mr7NgcCrMI0ReveTa/rnt3XBZtyY+1rlsQsy2oxgdAzbO587ENCQeMw2F/OWHaixMT8NDqxEqQd6xafK9Zmg6BeBjwgs7XfXKcR3WzNIuCO0ZG05+Yd0FIxmd/8Xm5tGiFEYr05+Ix6MLdF9MSCXZUPeu1EsYXhDljokLq49w63W1UMU10tm4t7VCEdaO+X9w6EJ5Ov8HDxb6L6IviUYY6+IGTZ01nwIoM6OrGQqfEAytYqgTKdehgQzQnAbLI6TW2wJ0twqEsLrlbTa4NW4j0KkazQJkN5kqcKYQvaeKJJhvJIG44Gi/u78pW3S6W7NU5DhrlE6bbxdIBHJW1vJBimkqu2oBNrO5ZoBB9MS9zflBsU5g/pQpVeHWMnWE8fcYDGa1PqAcr7q6wtdPsrVZhnHmmARN3PwZzIVVVsXbaIQG8VLC5grLGnwMf1Y1fz2nK3sVpCftvrYZT3G6CNAASo+eLOwYdZdiJ9jIS7WNLN1GtpIEvjeDt3QRqsDyH8YoAKUvY5h/v8IWPP/BaSwQbJwep4+Dj7xkpXX5/4wm4jEnVFV1p4xE0lD1AXvEMAVHtPhhggvscNhF9j6oeoPju6eTPcxG+5o= From fdf8e87b84b8fa3a147f12d6073d2d7b0dd61ef5 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Wed, 7 Nov 2018 01:50:37 +0800 Subject: [PATCH 3/4] docs(README.md): change build status URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f570b6a..58752e3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Deis Minio v2 -[![Build Status](https://ci.deis.io/job/minio/badge/icon)](https://ci.deis.io/job/minio) +[![Build Status](https://travis-ci.org/teamhephy/minio.svg?branch=master)](https://travis-ci.org/teamhephy/minio) [![Go Report Card](http://goreportcard.com/badge/deis/minio)](http://goreportcard.com/report/deis/minio) [![Docker Repository on Quay](https://quay.io/repository/deisci/minio/status "Docker Repository on Quay")](https://quay.io/repository/deisci/minio) From 2ad99dcf84bab086c64a78efa85657544863805a Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 12 Nov 2018 18:13:21 +0800 Subject: [PATCH 4/4] feat(minio): use minio's official docker image --- Makefile | 2 +- README.md | 6 ------ rootfs/Dockerfile | 26 +++++++++++++------------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index b764323..4faea68 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHORT_NAME := minio REPO_PATH := github.com/deis/${SHORT_NAME} DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH} -DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} +DEV_ENV_PREFIX := docker run --env CGO_ENABLED=0 --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE} LDFLAGS := "-s -X main.version=${VERSION}" diff --git a/README.md b/README.md index 58752e3..c700bc3 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,6 @@ The Deis project welcomes contributions from all developers. The high level proc * If your PR fixes any [issues][issues], make sure you write Fixes #1234 in your PR description (where #1234 is the number of the issue you're closing) * The Deis core contributors will review your code. After each of them sign off on your code, they'll label your PR with `LGTM1` and `LGTM2` (respectively). Once that happens, you may merge. -## Minio Binary Mirror - -Also, note that the [Dockerfile](rootfs/Dockerfile) uses an `ADD` directive to download pre-built Minio binaries from a [Google Cloud Storage bucket](https://console.cloud.google.com/storage/browser/minio-mirror/?project=deis-mirrors). The bucket is in the `deis-mirrors` project, and if you have access to that project, [this link](https://console.cloud.google.com/storage/browser/minio-mirror/?project=deis-mirrors) should take you directly to that bucket. - -To bump this component to use a newer build of Minio, simply add a new binary to the bucket (under the `linux-amd64` folder), check the checkbox under the `Share publicly` column, and update the URL in the `ADD` directive in the aforementioned `Dockerfile`. - ## Docker Based Development Environment The preferred environment for development uses the [`go-dev` Docker image](https://github.com/deisthree/docker-go-dev). The tools described in this section are used to build, test, package and release each version of Deis. diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 8e237a9..7ae66a4 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -1,20 +1,20 @@ -FROM quay.io/deis/base:v0.3.6 +FROM minio/mc:RELEASE.2018-11-06T01-12-20Z as mc -RUN adduser --system \ - --shell /bin/bash \ - --disabled-password \ - --home /home/minio \ - --group \ - minio +FROM minio/minio:RELEASE.2018-11-06T01-01-02Z + +COPY --from=mc /usr/bin/mc /usr/bin/mc + +RUN adduser \ + -s /bin/sh \ + -D \ + -h /home/minio \ + minio \ + minio COPY . / -RUN curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2018-11-06T01-12-20Z -o /usr/bin/mc \ - && chmod 755 /usr/bin/mc \ - && mkdir /home/minio/.minio \ - && chown minio:minio /home/minio/.minio -ADD https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2018-11-06T01-01-02Z /bin/minio -RUN chmod 755 /bin/minio +RUN mkdir /home/minio/.minio \ + && chown minio:minio /home/minio/.minio USER minio