Add custom secret names for Docker (#5355)

Paul Trunk committed 8 years ago

Commit bd9cdcf1 parent 7c72d145 files · +24 −7Browse files

Unified · Split

5 files

@@ -6,6 +6,8 @@ ENV GOPATH /go · 5 unmodified lines
6	6	ENV PATH $PATH:$GOPATH/bin
7	7	ENV CGO_ENABLED 0
8	8	ENV MINIO_UPDATE off
	9	+ENV MINIO_ACCESS_KEY_FILE=access_key \
	10	+ MINIO_SECRET_KEY_FILE=secret_key
9	11
10	12	WORKDIR /go/src/github.com/minio/
11	13

@@ -6,6 +6,8 @@ ENV GOPATH /go · 5 unmodified lines
6	6	ENV PATH $PATH:$GOPATH/bin
7	7	ENV CGO_ENABLED 0
8	8	ENV MINIO_UPDATE off
	9	+ENV MINIO_ACCESS_KEY_FILE=access_key \
	10	+ MINIO_SECRET_KEY_FILE=secret_key
9	11
10	12	WORKDIR /go/src/github.com/minio/
11	13

@@ -5,6 +5,8 @@ MAINTAINER Minio Inc <dev@minio.io> · 4 unmodified lines
5	5	COPY dockerscripts/docker-entrypoint.sh dockerscripts/healthcheck.sh /usr/bin/
6	6
7	7	ENV MINIO_UPDATE off
	8	+ENV MINIO_ACCESS_KEY_FILE=access_key \
	9	+ MINIO_SECRET_KEY_FILE=secret_key
8	10
9	11	RUN \
10	12	apk add --no-cache ca-certificates && \

@@ -24,15 +24,15 @@ fi · 23 unmodified lines
24	24
25	25	## Look for docker secrets in default documented location.
26	26	docker_secrets_env() {
27		− local MINIO_ACCESS_KEY_FILE="/run/secrets/access_key"
28		− local MINIO_SECRET_KEY_FILE="/run/secrets/secret_key"
	27	+ local ACCESS_KEY_FILE="/run/secrets/$MINIO_ACCESS_KEY_FILE"
	28	+ local SECRET_KEY_FILE="/run/secrets/$MINIO_SECRET_KEY_FILE"
29	29
30		− if [ -f $MINIO_ACCESS_KEY_FILE -a -f $MINIO_SECRET_KEY_FILE ]; then
31		− if [ -f $MINIO_ACCESS_KEY_FILE ]; then
32		− export MINIO_ACCESS_KEY="$(cat "$MINIO_ACCESS_KEY_FILE")"
	30	+ if [ -f $ACCESS_KEY_FILE -a -f $SECRET_KEY_FILE ]; then
	31	+ if [ -f $ACCESS_KEY_FILE ]; then
	32	+ export MINIO_ACCESS_KEY="$(cat "$ACCESS_KEY_FILE")"
33	33	fi
34		− if [ -f $MINIO_SECRET_KEY_FILE ]; then
35		− export MINIO_SECRET_KEY="$(cat "$MINIO_SECRET_KEY_FILE")"
	34	+ if [ -f $SECRET_KEY_FILE ]; then
	35	+ export MINIO_SECRET_KEY="$(cat "$SECRET_KEY_FILE")"
36	36	fi
37	37	fi
38	38	}

@@ -73,6 +73,17 @@ docker service create --name="minio-service" --secret="access_key" --secret="sec · 72 unmodified lines
73	73
74	74	Read more about `docker service` [here](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/)
75	75
	76	+#### Minio Custom Access and Secret Key files
	77	+To use other secret names follow the instuctions above and replace `access_key` and `secret_key` with your custom names (e.g. `my_secret_key`,`my_custom_key`). Run your service with
	78	+```
	79	+docker service create --name="minio-service" \
	80	+ --secret="my_access_key" \
	81	+ --secret="my_secret_key" \
	82	+ --env="MINIO_ACCESS_KEY_FILE=my_access_key" \
	83	+ --env="MINIO_SECRET_KEY_FILE=my_secret_key" \
	84	+ minio/minio server /data
	85	+```
	86	+
76	87	### Retrieving Container ID
77	88	To use Docker commands on a specific container, you need to know the `Container ID` for that container. To get the `Container ID`, run
78	89

Keyboard shortcuts