Skip to content

Commit 313b767

Browse files
kmalakmala
committed
Merge pull request #105 from kmala/rel
ref(minio):use official minio binary
2 parents 652f33e + b643394 commit 313b767

File tree

7 files changed

+8
-110
lines changed

7 files changed

+8
-110
lines changed

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
rootfs/bin/minio
22
rootfs/bin/boot
33
vendor/
4-
genssl/server.cert
5-
genssl/server.csr
6-
genssl/server.key
7-
genssl/server.pem
8-
manifests/deis-minio-secretssl-final.yaml
9-
mc/mc
10-
server/minio

‎Makefile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ build:
3535
test:
3636
${DEV_ENV_CMD} go test ${TEST_PACKAGES}
3737

38-
docker-build: build build-server
39-
# copy the server binary from where it was built to the final image's file system.
40-
# note that the minio server is built as a dependency of this build target.
41-
cp server/minio ${BINDIR}
38+
docker-build: build
4239

4340
# build the main image
4441
docker build --rm -t ${IMAGE} rootfs
@@ -47,8 +44,4 @@ docker-build: build build-server
4744

4845
deploy: build docker-build docker-push
4946

50-
# build the minio server
51-
build-server:
52-
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.6 ./install.sh
53-
5447
.PHONY: all bootstrap glideup build test docker-build deploy build-server

‎boot.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type Secret struct {
3434
Host string
3535
KeyID string
3636
AccessKey string
37+
Region string
3738
}
3839

3940
const configdir = "/home/minio/.minio/"
@@ -65,7 +66,8 @@ const templv2 = `{
6566
"credentials": {
6667
{{range .}}
6768
"accessKeyId": "{{.KeyID}}",
68-
"secretAccessKey": "{{.AccessKey}}"
69+
"secretAccessKey": "{{.AccessKey}}",
70+
"region": "{{.Region}}"
6971
{{end}}
7072
},
7173
"mongoLogger": {
@@ -139,6 +141,7 @@ func main() {
139141
Host: pod.IP,
140142
KeyID: key,
141143
AccessKey: access,
144+
Region: "us-east-1",
142145
},
143146
}
144147
t := template.New("MinioTpl")

‎genssl/gen.sh‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎genssl/manifest_replace.go‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎rootfs/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ COPY . /
1212
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 \
1313
&& chmod 755 /usr/bin/mc \
1414
&& mkdir /home/minio/.minio \
15-
&& chown minio:minio /home/minio/.minio
15+
&& chown minio:minio /home/minio/.minio \
16+
&& curl https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2016-04-17T22-09-24Z > /bin/minio \
17+
&& chmod 755 /bin/minio
1618

1719
USER minio
1820

‎server/install.sh‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)