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

Add v3 support of Docker Compose #600

Merged
merged 2 commits into from
Jun 14, 2017
Merged

Add v3 support of Docker Compose #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
683ae91
Update vendoring
cdrage May 24, 2017
2b58307
Add v3 support
cdrage Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,18 @@ import:
- package: github.com/spf13/viper
- package: github.com/pkg/errors

# We use libcompose to parse v1 and v2 of Docker Compose
- package: github.com/docker/libcompose
version: 01ff8920a57835fda41607e0f27252408e99cf08
subpackages:
- config
- lookup
- project

# We use docker/cli to parse v3 of Docker Compose
- package: github.com/docker/cli
version: 1fc7eb5d644599f30d0c6cc350a4d84ff528c864

- package: github.com/openshift/origin
version: v1.4.0-rc1
subpackages:
Expand Down Expand Up @@ -63,5 +68,4 @@ import:
# this makes sure that we are using version that is compatible with both.
# Glide will show WARN about conflicting rev (it this case it is OK)
- package: github.com/docker/docker
version: 601004e1a714d77d3a43e957b8ae8adbc867b280

version: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff
Loading