Skip to content

Update minio to master #78

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

Closed
mboersma wants to merge 3 commits into from
Closed

Update minio to master #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c22c347
chore(Makefile): update go-dev support to :0.8.0
mboersma Feb 18, 2016
ab34742
chore(glide.yaml): update minio-go to v1.0.0 release
mboersma Feb 18, 2016
223ba11
chore(server): build minio master from source
mboersma Feb 19, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export GO15VENDOREXPERIMENT=1

# dockerized development environment variables
REPO_PATH := github.com/deis/${SHORT_NAME}
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.5.0
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.8.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_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
Expand Down
2 changes: 1 addition & 1 deletion boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func readSecrets() (string, string) {
return strings.TrimSpace(string(keyID)), strings.TrimSpace(string(accessKey))
}

func newMinioClient(host string, port int, accessKey, accessSecret string, insecure bool) (minio.CloudStorageClient, error) {
func newMinioClient(host string, port int, accessKey, accessSecret string, insecure bool) (*minio.Client, error) {
return minio.New(
fmt.Sprintf("%s:%d", host, port),
accessKey,
Expand Down
42 changes: 23 additions & 19 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ import:
- /aboutme
- /utils
- package: github.com/minio/minio-go
version: c5884ce9ce3ac73b025d0bc58c4d3d72870edc0b
version: v1.0.0
4 changes: 3 additions & 1 deletion server/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
#
# See the 'mc' build target in the Makefile (in the parent directory) for an example of how to use this script.

apt-get update && apt-get install -yq yasm
mkdir -p $GOPATH/src/github.com/minio
cd $GOPATH/src/github.com/minio
curl -L -O -s https://github.com/minio/minio/archive/master.tar.gz && tar -xvzf master.tar.gz && rm master.tar.gz && mv minio-master minio
git clone -b master --single-branch https://github.com/minio/minio.git
cd minio
git checkout 51e611a && git reset --hard && git clean -fdq
make install
cp $GOPATH/bin/minio /pwd/minio
5 changes: 3 additions & 2 deletions src/healthsrv/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package healthsrv

import (
"fmt"
minio "github.com/minio/minio-go"
"net/http"

minio "github.com/minio/minio-go"
)

const (
Expand All @@ -12,7 +13,7 @@ const (
)

// Start starts the healthcheck server on $host:$port and blocks. It only returns if the server fails, with the indicative error
func Start(host string, port int, minioClient minio.CloudStorageClient) error {
func Start(host string, port int, minioClient *minio.Client) error {
mux := http.NewServeMux()
mux.Handle("/healthz", healthZHandler(minioClient))

Expand Down