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.

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

Jump to bottom

fix env substitution for docker compose v3 #658

Merged
merged 1 commit into from
Jun 20, 2017
Merged

fix env substitution for docker compose v3 #658

merged 1 commit into from
Jun 20, 2017

Conversation

kadel
Copy link
Member

@kadel kadel commented Jun 20, 2017

fixes #650

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 20, 2017
@kadel kadel force-pushed the fixv3EnvSubstitution branch from 8b893a7 to 4adf8d3 Compare June 20, 2017 11:20
@kadel kadel mentioned this pull request Jun 20, 2017
Closed
@bgruening
Copy link

@kadel awesome! Is it worth to include some tests for it, like the once from the issue maybe?

@kadel
Copy link
Member Author

kadel commented Jun 20, 2017

@kadel awesome! Is it worth to include some tests for it, like the once from the issue maybe?

definitely, I'll add it 😉

@surajnarwade
Copy link
Contributor

@kadel , works for me :)

@kadel kadel force-pushed the fixv3EnvSubstitution branch from 4adf8d3 to 0d06f9f Compare June 20, 2017 11:35
cdrage
cdrage approved these changes Jun 20, 2017
View reviewed changes
Copy link
Member

@cdrage cdrage left a comment

Choose a reason for hiding this comment

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

Other than two comments, LGTM.

pkg/loader/compose/v3.go Outdated
)

// converts os.Envrion ([]string) to map[string]string
Copy link
Member

Choose a reason for hiding this comment

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

small spelling error Environ :)

pkg/loader/compose/v3.go Outdated
// get environment variables
env, err := buildEnvironment()
if err != nil {
return kobject.KomposeObject{}, errors.Wrap(err, "can't build environment")
Copy link
Member

Choose a reason for hiding this comment

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

May be better putting "Cannot build environment variables"?

@kadel kadel force-pushed the fixv3EnvSubstitution branch from 0d06f9f to ef8c7a7 Compare June 20, 2017 13:16
@kadel
Copy link
Member Author

kadel commented Jun 20, 2017

fixed as per comments

@cdrage
Copy link
Member

cdrage commented Jun 20, 2017

LGTM.

@cdrage cdrage merged commit c5cac56 into kubernetes:master Jun 20, 2017
@bgruening
Copy link

@kadel does this also add replacements for ${FOO:-bar}? Haven't seen this in your tests.
Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdrage cdrage cdrage approved these changes

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

v3 env substitution is not working
5 participants
@kadel @bgruening @surajnarwade @cdrage @k8s-ci-robot