Skip to content

Commit 2ad99dc

Browse files
committed
feat(minio): use minio's official docker image
1 parent fdf8e87 commit 2ad99dc

3 files changed

Lines changed: 14 additions & 20 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHORT_NAME := minio
44
REPO_PATH := github.com/deis/${SHORT_NAME}
55
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
66
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
7-
DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
7+
DEV_ENV_PREFIX := docker run --env CGO_ENABLED=0 --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
88
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
99

1010
LDFLAGS := "-s -X main.version=${VERSION}"

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ The Deis project welcomes contributions from all developers. The high level proc
3333
* 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)
3434
* 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.
3535

36-
## Minio Binary Mirror
37-
38-
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.
39-
40-
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`.
41-
4236
## Docker Based Development Environment
4337

4438
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.

rootfs/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
FROM quay.io/deis/base:v0.3.6
1+
FROM minio/mc:RELEASE.2018-11-06T01-12-20Z as mc
22

3-
RUN adduser --system \
4-
--shell /bin/bash \
5-
--disabled-password \
6-
--home /home/minio \
7-
--group \
8-
minio
3+
FROM minio/minio:RELEASE.2018-11-06T01-01-02Z
4+
5+
COPY --from=mc /usr/bin/mc /usr/bin/mc
6+
7+
RUN adduser \
8+
-s /bin/sh \
9+
-D \
10+
-h /home/minio \
11+
minio \
12+
minio
913

1014
COPY . /
1115

12-
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 \
13-
&& chmod 755 /usr/bin/mc \
14-
&& mkdir /home/minio/.minio \
15-
&& chown minio:minio /home/minio/.minio
16-
ADD https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2018-11-06T01-01-02Z /bin/minio
17-
RUN chmod 755 /bin/minio
16+
RUN mkdir /home/minio/.minio \
17+
&& chown minio:minio /home/minio/.minio
1818

1919
USER minio
2020

0 commit comments

Comments
 (0)