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

Added two examples with labels in docker-compose.yml #3891

Merged
merged 2 commits into from Oct 10, 2018
Merged

Added two examples with labels in docker-compose.yml #3891

merged 2 commits into from Oct 10, 2018

Conversation

pascalandy
Copy link
Contributor

@pascalandy pascalandy commented Sep 14, 2018

What does this PR do?

Doc: Added two example / Using labels in docker-compose.yml

Motivation

#563 (comment)

More

null

Additional Notes

#563 (comment)

@MindTooth
Copy link

Maybe add a small notice regarding $$. So that there is an explicit mention.

Nice PR otherwise. Been missing such section a long time. 👍

@pascalandy
Copy link
Contributor Author

I don't know what to say regarding the $$. Please enlighted me :)

@MindTooth
Copy link

I'll look into maybe writing some text. I think the official documentation have some great stuff though.

Source: https://docs.docker.com/compose/compose-file/#variable-substitution

@pascalandy
Copy link
Contributor Author

Thanks, I'll add a note about it. Need to run this morning!

@ldez
Copy link
Member

ldez commented Sep 17, 2018

@pascalandy could you rebase on v1.7 and change the base branch of the PR to v1.7 (edit button on the top of the PR)

@pascalandy pascalandy changed the base branch from master to v1.7 September 18, 2018 00:49
@pascalandy pascalandy requested review from a team as code owners September 18, 2018 00:53
@pascalandy
Copy link
Contributor Author

Add more details and switched to branch 1.7
Hope everything is good now :)

@ldez ldez removed the bot/no-merge label Sep 18, 2018
@ldez ldez added this to the 1.7 milestone Sep 18, 2018
@ldez ldez removed request for a team September 18, 2018 01:00
Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

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

Hello @pascalandy ,

thanks a lot for your time on this proposal.
Great work!

I've put a few language (minor) reviews to fix.

Also, would it be possible to create a new User Guide's page named "Using Labels with Docker-Compose"?
Because this content deserves a dedicated page, instead of being lost on the bottom of the "Examples" pages.

If you need help on doing this, do not hesitate to ping me on the community's Slack at https://slack.traefik.io/ : I will happily allocate some time with you to work on this.

Thanks again!

docs/user-guide/examples.md Show resolved Hide resolved
docs/user-guide/examples.md Show resolved Hide resolved
docs/user-guide/examples.md Show resolved Hide resolved
@pascalandy
Copy link
Contributor Author

pascalandy commented Sep 18, 2018

I agree!

would it be possible to create a new User Guide's page named "Using Labels with Docker-Compose"?

Let's start by merging this first :)

@dduportal
Copy link
Contributor

Hello @pascalandy , after a discussion with other maintainers, it sounds like that instead of a very specific example in the user guide section (which is already "complicated"),
updating the section https://docs.traefik.io/configuration/backends/docker/#using-docker-compose with a note specifying the $$ trick could be a simple but valuable information.

We fear the maintenance effort of a full docker-compose.yml as you provided (there are already too much in the User Guides ;) ) could be a pain.

Is there another intent in this user guide you wanted to underline (a use case)? If, could you details the intent?

@pascalandy
Copy link
Contributor Author

The use case was from months of conversation on #563 (comment). The regex ability is a powerful one.

Maybe I could only showcase the labels and not the whole docker-compose file. I personally prefer a full blast example :)

@dduportal
Copy link
Contributor

Hello @pascalandy , my apologies for the delay of response.

Thanks for this contribution. It is LGTM.

We might want to rework example section later, but right now it is ok.

Copy link
Member

@ldez ldez left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@nmengin nmengin left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -371,7 +371,9 @@ deploy:

Something more tricky using `regex`.

In this case a slash is added to `siteexample.io/portainer` and redirect to `siteexample.io/portainer/`. For more details: https://github.com/containous/traefik/issues/563
In this case a slash is added to `siteexample.io/portainer` and redirect to `siteexample.io/portainer/`. For more details: https://github.com/containous/traefik/issues/563

Choose a reason for hiding this comment

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

Should this not be redirected instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

correct redirected

@geraldcroes geraldcroes changed the title Added two example / Using labels in docker-compose.yml Added two example with labels in docker-compose.yml Oct 15, 2018
@geraldcroes geraldcroes changed the title Added two example with labels in docker-compose.yml Added two examples with labels in docker-compose.yml Oct 15, 2018
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.

None yet

7 participants