Alexandr Morozov
862952c8d4
Fix race condition between parseSecurityOpt and container.Mount
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2014-12-11 17:22:59 -08:00
Jessica Frazelle
fd831b4c5e
Fix conflicts.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-11 17:14:53 -08:00
Ben Firshman
e317d7d9f4
Merge pull request #89 from bfirsh/remove-mitchellh-homedir
...
Remove mitchellh/go-homedir from godeps
2014-12-12 01:14:21 +00:00
Ben Firshman
e12df0cbc2
Merge pull request #87 from ggiamarchi/machine-ls-sort
...
Sort `machine ls` output by machine name
2014-12-12 01:14:12 +00:00
Jessica Frazelle
c509835475
Change version to 1.4.0-dev
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-11 17:00:43 -08:00
Guillaume Giamarchi
d8921ee432
Move HostListItem from host.go to command.go
...
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com >
2014-12-12 01:53:24 +01:00
Ben Firshman
a5505e7711
Merge pull request #721 from dnephin/fix_broken_tests
...
Include image name for env_file tests
2014-12-12 00:46:41 +00:00
Guillaume Giamarchi
8797ca2d50
Rename HostState struct to HostListItem
...
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com >
2014-12-12 01:44:34 +01:00
Jessie Frazelle
0e4e200071
Merge pull request #9345 from jfrazelle/bump_v1.4.0
...
Bump version to 1.4.0
2014-12-11 16:31:29 -08:00
Ben Firshman
ee48b4ae01
Remove mitchellh/go-homedir from godeps
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-11 16:24:04 -08:00
Ben Firshman
ee98043c5a
Merge pull request #88 from MSOpenTech/homedir
...
Fix #68 . Homedir is now detected same as Docker.
2014-12-12 00:22:53 +00:00
Jeff Mendoza
52019047f1
Fix #68 . Homedir is now detected same as Docker.
...
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com >
2014-12-11 16:11:23 -08:00
Guillaume Giamarchi
1547a48dde
Sort machine ls output by machine name
...
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com >
2014-12-12 00:39:08 +01:00
Victor Vieux
008398cc99
update READMEs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-11 23:32:48 +00:00
Victor Vieux
1f9eac7fd1
Initialize in the interface
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-11 23:23:10 +00:00
Jessica Frazelle
4595d4fb03
Bump version to v1.4.0
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-11 15:00:44 -08:00
Jessica Frazelle
debf60b466
Merge branch master into bump_v1.4.0
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2014-12-11 15:00:03 -08:00
Brian Bland
5fbf08bab5
Adds tests for storage driver handling of valid and invalid paths
2014-12-11 14:54:04 -08:00
Daniel Nephin
8f8e322de2
Include image name for env_file tests.
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com >
2014-12-11 14:25:26 -08:00
Victor Vieux
d891711f8c
Merge pull request #165 from aluzzardi/fix-cluster-lookup
...
Cluster: Fix empty name container lookup.
2014-12-11 14:21:58 -08:00
Brian Bland
8a1889efeb
Enforces a path format for storage drivers ( #819 )
...
Requires all paths in the inmemory and filesystem drivers to begin with
a slash, and then contain only valid path components (2+ alphanumeric
characters with optional period, hyphen, and underscore separators)
delimited by slashes.
Also updates the storage driver test suites to construct paths of this
format, and causes the suite to abort if files are not cleaned up after
the test run.
2014-12-11 14:19:41 -08:00
Victor Vieux
f95f943b4a
use 1.5*heartbeat as TTL in etcd
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-11 22:18:54 +00:00
Victor Vieux
2282fc89ef
add node type
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-11 21:59:01 +00:00
Jessie Frazelle
ce1393cb55
Merge pull request #9616 from cyphar/9608-builder-fix-incomplete-chown-walk-addcontext
...
builder: internals: fix incomplete chown walk when fixing permissions
2014-12-11 13:54:08 -08:00
Michael Crosby
4d318db749
Merge pull request #9620 from tiborvass/merge_release_v1.3.3
...
Merge release v1.3.3
2014-12-11 13:53:32 -08:00
Tibor Vass
9f48be69e5
Change version to 1.3.3-dev
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:35:22 -05:00
unclejack
5b851982da
Bump version to v1.3.3
...
Conflicts:
VERSION
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:33:20 -05:00
Ben Firshman
932779fed1
Merge pull request #64 from MSOpenTech/master
...
Added support for identity auth in Azure driver
2014-12-11 21:31:07 +00:00
Tibor Vass
fdabd6b14e
docs: Add release notes
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:29:28 -05:00
unclejack
bff1d9dbce
validate image ID properly & before load
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Conflicts:
graph/load.go
2014-12-11 16:29:27 -05:00
Arnaud Porterie
af2021955c
Add integration test for xz path issue
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-11 16:29:15 -05:00
Michael Crosby
001ac15b54
Decompress archive before streaming the unpack in a chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
pkg/archive/archive.go
pkg/chrootarchive/archive.go
Conflicts:
pkg/archive/archive.go
2014-12-11 16:29:13 -05:00
Michael Crosby
7862f831fe
Update chroot apply layer to handle decompression outside chroot
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
pkg/archive/diff.go
pkg/chrootarchive/archive.go
Conflicts:
pkg/archive/diff.go
pkg/chrootarchive/diff.go
2014-12-11 16:28:24 -05:00
Cristian Staretu
e4ba82d50e
Add build tests covering extraction in chroot
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-11 16:26:52 -05:00
unclejack
a57eee2229
integ-cli: add test for links in volumes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-11 16:26:52 -05:00
unclejack
7496cbbccc
integ-cli: add build test for absolute symlink
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2014-12-11 16:26:52 -05:00
Tibor Vass
0e71a48d4e
Add another symlink breakout test
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
integration-cli/docker_cli_build_test.go
2014-12-11 16:26:51 -05:00
Tibor Vass
5f0f0c228d
symlink: add more tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:26:01 -05:00
Tibor Vass
ff4d05ed73
symlink: cleanup names and break big test into multiple smaller ones
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:26:01 -05:00
Tibor Vass
b7f352b0fb
Refactor of symlink tests to remove testdata dir
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
2014-12-11 16:26:01 -05:00
Tianon Gravi
fa3ec89515
Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
2014-12-11 16:26:01 -05:00
Victor Vieux
875e7c7e77
add discovery/README.md
2014-12-11 21:18:13 +00:00
Daniel Nephin
64762c9dea
Merge pull request #716 from bfirsh/pull-latest-tag-by-default
...
Pull latest tag by default
2014-12-11 15:58:40 -05:00
Ben Firshman
8ebec9a67f
Pull latest tag by default
...
This was changed in Docker recently:
https://github.com/docker/docker/pull/7759
This means we aren't pulling loads of tags when we only use the
latest.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-11 12:37:04 -08:00
Tibor Vass
be8f9a2313
Merge pull request #9617 from tiborvass/bump_v1.3.3
...
Bump v1.3.3
2014-12-11 15:31:43 -05:00
Ben Firshman
45b2712032
Merge pull request #720 from dnephin/upstream_minor_fixes
...
Support a timeout on docker client
2014-12-11 19:28:33 +00:00
Aleksa Sarai
916cba9c58
builder: internals: fix incomplete chown walk when fixing permissions
...
This patch fixes the permission fixing code used by addContext, which
would not be responsible for Lchown-ing top-level directories added to a
destination that didn't exist prior to untar-ing the context.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-12-12 06:07:16 +11:00
Daniel Nephin
3c0f297ba6
Some minor cleanup from yelp/fig
...
Signed-off-by: Daniel Nephin <dnephin@yelp.com >
2014-12-11 10:08:39 -08:00
Vincent Batts
74bbb93571
Merge pull request #9258 from rhvgoyal/transaction-id-improvements
...
devmapper fix usage of pool transaction id
2014-12-11 12:58:18 -05:00
Peter Waller
3a08bbc4d2
Improve message when pushing a non-existent image
...
I was confused earlier when I did:
```
docker push localhost.localdomain:1234/foo
```
Because docker told me:
```
No such id: localhost.localdomain:1234/foo
```
I actually had buried in my mind the solution to this, but the error
message
confused me because I had recently had some fun trying to get the
registry
working and therefore thought it was telling me that I didn't have an
account
on the registry.
This pull request makes it unambiguous that the error is that the
specified
image is unknown.
/cc @cpuguy83
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-12-11 17:57:23 +00:00