Skip to content

Comments

Update Compose file reference for version 3#716

Merged
londoncalling merged 1 commit intodocker:masterfrom
aanand:compose-file-v3
Dec 16, 2016
Merged

Update Compose file reference for version 3#716
londoncalling merged 1 commit intodocker:masterfrom
aanand:compose-file-v3

Conversation

@aanand
Copy link
Contributor

@aanand aanand commented Nov 25, 2016

Currently a rough draft. This document will only be true once Engine 1.13 and Compose 1.10 are released.

TODO:

  • healthcheck
  • stop_grace_period

@johndmulhausen
Copy link
Contributor

johndmulhausen commented Nov 25, 2016

- data-volume:/var/lib/backup/data

volumes:
log-volume:
Copy link
Contributor

Choose a reason for hiding this comment

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

data-volume I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whoops, fixed

@aanand aanand force-pushed the compose-file-v3 branch 3 times, most recently from 7676779 to 9519caf Compare November 29, 2016 16:07
@aanand
Copy link
Contributor Author

aanand commented Nov 29, 2016

Added docs for healthcheck and stop_grace_period

test: ["CMD", "curl", "-f", "http://localhost"]
interval: 1m30s
timeout: 10s
retries: 3
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't we have disable: true as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, I've added a note at the bottom and removed the test: ["NONE"] example.

> `volume_driver`.
- No path expansion will be done if you have also specified a `volume_driver`.
For example, if you specify a mapping of `./foo:/data`, the `./foo` part
will be passed straight to the volume driver without being expanded.
Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't know this was a thing we did.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, check out test_home_directory_with_driver_does_not_expand in config_test.py

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

LGTM

@joaofnfernandes
Copy link
Contributor

@mstanleyjones, @johndmulhausen this is an example of a file that deserves to have proper versioning. We should consider having a file for each compose file format. That way we can teach new users how to do things the new way so that they don't even learn the old format.

@londoncalling
Copy link
Contributor

LGTM

@londoncalling londoncalling merged commit 7f29168 into docker:master Dec 16, 2016
@joaofnfernandes
Copy link
Contributor

Isn't this supposed to be updated for 1.13? If so, shouldn't we merge this in vnext-engine, and not master?

@londoncalling
Copy link
Contributor

@dnephin @aanand @nathanleclaire did you want this merged into master or vnext? I just got a ping from both Daniel and Nathen to merge this PR.

@johndmulhausen
Copy link
Contributor

@aanand @londoncalling @dnephin @mstanleyjones

I think we meant to do this in vnext-compose as it's for Compose v1.10.

It should also be tracked against the Compose v1.10 milestone: https://github.com/docker/docker.github.io/milestone/5

So, one more revert, and one more re-do. Sorry.

CC'ing @mstanleyjones because I'm not sure when the last time we rebased vnext-compose was.

bermudezmt pushed a commit that referenced this pull request Nov 7, 2018
Add existing pages to UCP 3.0 (archiving 3.0 files to version-based archive directory)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants