Skip to content
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.

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

feat(normalize_storage): use MINIO_BUCKET env-var #141

Merged
merged 2 commits into from
Aug 8, 2017

Conversation

drgarcia1986
Copy link
Contributor

Use MINIO_BUCKET environment variable to define the bucket name for minio storage type
instead of hardcoded git

If there isnt a value on MINIO_BUCKET var, normalize_storage will use git by default

@deis-admin
Copy link

Thanks for the contribution! Please ensure your commits follow our style guide. This code will be tested once a Deis maintainer reviews it.

@drgarcia1986
Copy link
Contributor Author

related deis/slugrunner#66

@mboersma
Copy link
Member

mboersma commented Aug 3, 2017

Jenkins, add to whitelist.

@mboersma
Copy link
Member

mboersma commented Aug 3, 2017

Looks like shellcheck complained about not quoting a variable. Sorry--it's pretty strict but obviously an easy fix.

09:30:32 
09:30:32 In rootfs/bin/normalize_storage line 6:
09:30:32   echo $MINION_BUCKET_NAME > /app/objectstore/minio/builder-bucket
09:30:32        ^-- SC2086: Double quote to prevent globbing and word splitting.
09:30:32 
09:30:32 Makefile:56: recipe for target 'test-style' failed

@drgarcia1986
Copy link
Contributor Author

Oh sure, make sense, sorry my bad!
Fixed!

@@ -1,8 +1,9 @@
#!/usr/bin/env bash
export BUCKET_FILE=/var/run/secrets/deis/objectstore/creds/builder-bucket
if [ "$BUILDER_STORAGE" == "minio" ]; then
MINION_BUCKET_NAME=${MINIO_BUCKET:-git}
Copy link
Member

Choose a reason for hiding this comment

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

Could you make this MINIO_BUCKET_NAME (not MINION)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Use MINIO_BUCKET environment variable to define the bucket name for minio storage type
instead of hardcoded `git`

If there isnt a value on MINIO_BUCKET var, normalize_storage will use `git` by default
@drgarcia1986
Copy link
Contributor Author

Hi @mboersma , Is there something then I need to fix?

@mboersma
Copy link
Member

mboersma commented Aug 4, 2017

@drgarcia1986 not your problem as far as I can tell, it looks like we have some issues with the e2e tests. I'll be looking at that today and get it sorted out.

@drgarcia1986
Copy link
Contributor Author

@mboersma tks 👍

@mboersma
Copy link
Member

mboersma commented Aug 7, 2017

Jenkins, test this please.

@drgarcia1986
Copy link
Contributor Author

c'mon jenkins, be nice to me :/

@vdice vdice merged commit ce4ba39 into deis:master Aug 8, 2017
@drgarcia1986 drgarcia1986 deleted the minio-bucket-fix branch August 8, 2017 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants