1
0
mirror of https://github.com/docker/docs.git synced 2026-11-12 16:32:36 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Evan Hazlett
d09013e8a2 Merge pull request #1198 from exoscale/fix/remove-extra-machine-binary
Remove extra machine binary at the root of the repository.
2015-05-20 11:26:16 -04:00
Ben Firshman
f5ac1fa073 Remove whitespace from json hash
Reasoning:

e5d8447f06 (commitcomment-11243708)

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-20 16:02:08 +01:00
Jessie Frazelle
c696993452 Merge pull request #13347 from fntlnz/13184-remove-delete-container
Removed deleteContainer calls
2015-05-20 07:18:41 -07:00
Brian Goff
37e4d40228 Merge pull request #13328 from icecrime/10662-registryfix-carry
Windows: fix registry filepath and location
2015-05-20 10:09:46 -04:00
Ben Firshman
f79eb7b9ad Merge pull request #1382 from lsowen/security_opt
Add security_opt as a docker-compose.yml option
2015-05-20 13:40:42 +01:00
Aanand Prasad
b0b6ed31c4 Merge pull request #1430 from albers/fix-1426
Fix #1426 - migrate_to_labels not found
2015-05-20 12:31:18 +01:00
Vincent Bernat
990009644a Remove extra machine binary at the root of the repository.
This has been erroneously added in #1175.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-05-20 10:32:39 +02:00
Lorenzo Fontana
086b514f6a Removed deleteContainer calls
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-05-20 08:38:23 +02:00
Sven Dowideit
a09dfbcaad Merge pull request #13214 from zoechi/master
add bwu_docker
2015-05-20 13:43:16 +10:00
Andrea Luzzardi
3f01413b75 leadership: Distributed Leader Election
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:14:28 -07:00
Andrea Luzzardi
78839ba4ea store: Improved locking API and added mocks.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:14:28 -07:00
Andrea Luzzardi
2ff9679938 store: CreateStore -> NewStore
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-05-19 20:13:29 -07:00
Andrea Luzzardi
71a5fd944a Merge pull request #801 from abronan/add_ephemeral_support
store: Add node Ephemeral support
2015-05-19 20:13:06 -07:00
Derek McGowan
13894e8736 Break down type dependencies
Each type no longer requires holding a reference to repository.
Added implementation for signatures get.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-05-19 19:56:27 -07:00
Qiang Huang
c646e514db Fix unit-test build error on ARM64
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-20 10:45:04 +08:00
Sven Dowideit
a057accb59 Merge pull request #13315 from SvenDowideit/add-kitematic-docs
Add Kitematic documentation to docs.master.docker.com
2015-05-20 12:27:33 +10:00
Derek McGowan
a3276fcc5b Feedback update
Update comments and TODOs
Fix switch style
Updated parse http response to take in reader
Add Cancel implementation
Update blobstore variable name

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-05-19 19:18:30 -07:00
Sven Dowideit
82bd3886d5 Add Kitematic documentation to docs.master.docker.com
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-20 01:57:45 +00:00
Xian Chaobo
df50eb8c67 add unit test
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:54:03 -04:00
Vincent Giersch
394eea0231 Storage Driver: Ceph Object Storage (RADOS)
This driver implements the storagedriver.StorageDriver interface and
uses Ceph Object Storage as storage backend.

Since RADOS is an object storage and no hierarchy notion, the
following convention is used to keep the filesystem notions stored in
this backend:

* All the objects data are stored with opaque UUID names prefixed
  (e.g. "blob:d3d232ff-ab3a-4046-9ab7-930228d4c164).
* All the hierarchy information are stored in rados omaps, where the
  omap object identifier is the virtual directory name, the keys in
  a specific are the relative filenames and the values the blob
  object identifier (or empty value for a sub directory).

  e.g. For the following hierarchy:

     /directory1
     /directory1/object1
     /directory1/object2
     /directory1/directory2/object3

  The omap "/directory1" will contains the following key / values:
    - "object1" "blob:d3d232ff-ab3a-4046-9ab7-930228d4c164"
    - "object2" "blob:db2e359d-4af0-4bfb-ba1d-d2fd029866a0"
    - "directory2" ""

  The omap "/directory1/directory2" will contains:
    - "object3" "blob:9ae2371c-81fc-4945-80ac-8bf7f566a5d9"

* The MOVE is implemented by changing the reference to a specific
  blob in its parent virtual directory omap.

This driver stripes rados objects to a fixed size (e.g. 4M). The idea
is to keep small objects (as done by RBD on the top of RADOS) that
will be easily synchronized accross OSDs. The information of the
original object (i.e total size of the chunks) is stored as a Xattr
in the first chunk object.

Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-05-20 01:44:34 +00:00
Xian Chaobo
e6ce59794e merge two image match func
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-05-19 21:39:10 -04:00
Alexandre Beslic
38f78b02b5 Reset ephemeral session on renewal failure
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 18:30:59 -07:00
Jessie Frazelle
d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts
Fix Put without Get in overlay
2015-05-20 03:11:58 +02:00
Arnaud Porterie
496bc46c88 Merge pull request #13060 from mrjana/cnm_integ
Replace existing docker networking code and integrate with libnetwork
2015-05-19 17:24:18 -07:00
Jeffrey Morgan
0d52985606 Go back 2015-05-19 16:14:01 -07:00
Jana Radhakrishnan
f12f51b8b9 Removed dead code from docker after libnetwork integration
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-19 22:40:55 +00:00
Jana Radhakrishnan
d18919e304 Docker integration with libnetwork
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-19 22:40:19 +00:00
Jana Radhakrishnan
272f8cd4bc Vendoring in libnetwork, netns, netlink
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-19 22:40:18 +00:00
Alexandre Beslic
b8d72c291d Cleanup, fix Integration tests and use of a single global Session in Consul
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 15:27:39 -07:00
Nathan LeClaire
2f78b7f92a Move code to use SSH "backends"
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-05-19 15:02:57 -07:00
David Calavera
322f675123 Merge pull request #13332 from LK4D4/fix_race_in_rand
Use goroutine-safe version of rand.Source
2015-05-19 14:20:33 -07:00
Jessie Frazelle
92c869cd12 Merge pull request #12437 from fmzhen/remove-regex-replace
Removal of the regex to replace ips
2015-05-19 22:59:17 +02:00
Fred Lifton
4a743c39dd Merge pull request #13119 from psankar/master
Followup commit to https://github.com/docker/docker/pull/12986
2015-05-19 13:14:20 -07:00
Alexandre Beslic
4537b9f2ba Remove unused code
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:57:43 -07:00
Alexander Morozov
d8661250e7 Use goroutine-safe version of rand.Source
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-19 12:32:40 -07:00
Alexandre Beslic
5d106186fb remove the periodic session renewal in Consul until we figure out what to do with etcd..
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:31:39 -07:00
Evan Hazlett
bd93f2e9cf Merge pull request #1180 from hairyhenderson/arm-linux-build
Adding linux/arm to the platforms that get built
2015-05-19 15:28:35 -04:00
Evan Hazlett
309afd1112 Merge pull request #1175 from hairyhenderson/add-machine-name-envvar-925
Adding new DOCKER_MACHINE_NAME environment variable
2015-05-19 15:28:13 -04:00
Alexandre Beslic
ec478d8ed5 Add integration tests for engines departure with node removal and ephemeral behavior
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 12:08:56 -07:00
Stephen Day
36d4e365aa Merge pull request #534 from liggitt/respository_typo
Fix typo: respository->repository
2015-05-19 12:07:24 -07:00
Lorenzo Fontana
a2787469ac Using dockerCmd when possible
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-05-19 20:33:59 +02:00
Jeffrey Morgan
0de00dd082 Bump to 0.5.27 2015-05-19 11:21:32 -07:00
Doug Davis
7fcf849749 Make version check return 400 instead of 404
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-19 11:21:05 -07:00
Jeffrey Morgan
13d2f7ada8 Fixing header drag issue 2015-05-19 11:14:37 -07:00
Jeffrey Morgan
89cec26648 WIP login 2015-05-19 11:13:47 -07:00
Arnaud Porterie
81e7d3571b Windows: fix registry filepath and location
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-19 10:58:45 -07:00
lsowen
ea7ee301c0 Add security_opt as a docker-compose.yml option
Signed-off-by: Logan Owen <lsowen@s1network.com>
2015-05-19 13:47:41 -04:00
Arnaud Porterie
0cc5da0635 Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
Windows: Refactor container
2015-05-19 10:44:23 -07:00
Jordan Liggitt
32ed2d7df1 Fix typo: respository->repository
Signed-off-by: Jordan Liggitt <jliggitt@redhat.com>
2015-05-19 13:25:39 -04:00
Alexandre Beslic
f81de46ab4 Fix Consul and etcd with latest changes, use etcd v2.0.11 for integration tests, remove call to SyncCluster for now (breaks the integration tests)
Signed-off-by: Alexandre Beslic <abronan@docker.com>
2015-05-19 10:25:31 -07:00