Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ kube-mc-integration:

# 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.5.2 ./install.sh
docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.6 ./install.sh

mc-build:
make -C mc build
Expand Down
3 changes: 2 additions & 1 deletion server/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
apt-get update && apt-get install -yq yasm
mkdir -p $GOPATH/src/github.com/minio
cd $GOPATH/src/github.com/minio
git clone -b deis --single-branch https://github.com/deis/minio-src.git minio
git clone -b master --single-branch https://github.com/minio/minio.git minio

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than "master" which floats, it would be safer to build from a specific git commit SHA here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minio people had said they are gonna make a release this weekend mostly... We can wait or we can rebase our Deis/minio-src branch to latest

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master will probably change many times over the next few days, so the contents of the deis/minio image could change depending on when someone builds it. That's not good for people testing or for CI, where we need reproducible builds.

I still think using a current SHA is safer. Then when minio actually has a new release tag we can test that code and switch to that.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 to @mboersma's suggestion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 here too. we built off master for alpha since our release was already a "moving target". now that we're solidified a bit, we should freeze the minio code that we release.

also, if/when Minio makes a release, it also would come in prebuilt binary form, so we could simply download and use it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made the change to use the current SHA

cd minio
git reset --hard 356b889
make install
cp $GOPATH/bin/minio /pwd/minio