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

Fix the examples #528

Merged
merged 1 commit into from
Apr 10, 2017
Merged

Fix the examples #528

merged 1 commit into from
Apr 10, 2017

Conversation

cdrage
Copy link
Member

@cdrage cdrage commented Mar 31, 2017

Moves docker-compose.yaml to docker-compose-counter.yaml and
replaces the default docker-compose.yaml with the example from the
Kompose.io website.

We also rename each file from yml to yaml.

As well as do some slight modifications / formatting to
docker-compose-bundle.dab

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 31, 2017
@cdrage
Copy link
Member Author

cdrage commented Mar 31, 2017

Uh oh. Looks like we relied on those examples for some odd-reason in the tests. I'll update this.

@kadel
Copy link
Member

kadel commented Apr 3, 2017

I noticed that you've deleted examples/docker-guestbook.yml ?

@cdrage
Copy link
Member Author

cdrage commented Apr 3, 2017

@kadel

Yes. That's replaced by docker-compose.yaml which is the guestbook example we use on http://kompose.io

@cdrage
Copy link
Member Author

cdrage commented Apr 3, 2017

@kadel docker-compose.yaml was missing since it was added to .gitignore. I've updated this PR.

@surajnarwade
Copy link
Contributor

surajnarwade commented Apr 4, 2017

@cdrage , functional tests need to be updated as you renamed the file docker-compose.yml -> docker-compose.yaml
https://github.com/kubernetes-incubator/kompose/blob/master/script/test/cmd/tests.sh#L182-L188

@kadel
Copy link
Member

kadel commented Apr 4, 2017

I'm lost in all this :-)

now you are reneaming docker-guestbook.yml to docker-compose.yaml?
Maybe you wanted docker-guestbook.yaml?

@cdrage
Copy link
Member Author

cdrage commented Apr 4, 2017

@kadel
Yes, I'm renaming it. If you check http://kompose.io both docker-guestbook.yaml and the example on the site is the same. Since it's our go-to-example. I've renamed docker-guestbook.yaml to docker-compose.yaml in the examples folder.

@cdrage
Copy link
Member Author

cdrage commented Apr 4, 2017

@surajnarwade Yes, as referenced in this PR, #531 unblocks this PR.

@kadel
Copy link
Member

kadel commented Apr 6, 2017

Yes, I'm renaming it. If you check http://kompose.io both docker-guestbook.yaml and the example on the site is the same. Since it's our go-to-example. I've renamed docker-guestbook.yaml to docker-compose.yaml in the examples folder.

OK

@kadel
Copy link
Member

kadel commented Apr 6, 2017

I guess this will need rebase once #531 is merged

Moves `docker-compose.yaml` to `docker-compose-counter.yaml` and
replaces the default docker-compose.yaml with the example from the
Kompose.io website.

We also rename each file from yml to yaml.

As well as do some slight modifications / formatting to
docker-compose-bundle.dab
@cdrage
Copy link
Member Author

cdrage commented Apr 10, 2017

Rebased and waiting for Travis to pass then mergin'

@cdrage
Copy link
Member Author

cdrage commented Apr 10, 2017

Woop woop! Mergin' awayyy

@cdrage cdrage merged commit c7cfb5e into kubernetes:master Apr 10, 2017
@cdrage cdrage deleted the add-website-example branch May 26, 2017 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants