Skip to content

ref(minio):use official minio binary #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmala merged 2 commits into from
Jun 3, 2016
Merged

ref(minio):use official minio binary #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9054b21
ref(minio):use official minio binary
Jun 2, 2016
b643394
remove unused code artifacts
Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
rootfs/bin/minio
rootfs/bin/boot
vendor/
genssl/server.cert
genssl/server.csr
genssl/server.key
genssl/server.pem
manifests/deis-minio-secretssl-final.yaml
mc/mc
server/minio
9 changes: 1 addition & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ build:
test:
${DEV_ENV_CMD} go test ${TEST_PACKAGES}

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}
docker-build: build

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

deploy: build docker-build docker-push

# build the minio server
build-server:
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.6 ./install.sh

.PHONY: all bootstrap glideup build test docker-build deploy build-server
5 changes: 4 additions & 1 deletion boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type Secret struct {
Host string
KeyID string
AccessKey string
Region string
}

const configdir = "/home/minio/.minio/"
Expand Down Expand Up @@ -65,7 +66,8 @@ const templv2 = `{
"credentials": {
{{range .}}
"accessKeyId": "{{.KeyID}}",
"secretAccessKey": "{{.AccessKey}}"
"secretAccessKey": "{{.AccessKey}}",
"region": "{{.Region}}"
{{end}}
},
"mongoLogger": {
Expand Down Expand Up @@ -139,6 +141,7 @@ func main() {
Host: pod.IP,
KeyID: key,
AccessKey: access,
Region: "us-east-1",
},
}
t := template.New("MinioTpl")
Expand Down
16 changes: 0 additions & 16 deletions genssl/gen.sh
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions genssl/manifest_replace.go
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ 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 \
&& chmod 755 /usr/bin/mc \
&& mkdir /home/minio/.minio \
&& chown minio:minio /home/minio/.minio
&& chown minio:minio /home/minio/.minio \
&& curl https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2016-04-17T22-09-24Z > /bin/minio \
&& chmod 755 /bin/minio

USER minio

Expand Down
21 changes: 0 additions & 21 deletions server/install.sh
View file
Open in desktop

This file was deleted.