1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Ying Li
c9e91446a1 Builder interface cleanup and bugfixes:
- can never set an invalid repo, so we can remove the failed builder state
- once a builder is "finished", it's swapped out with one that has no state and cannot be modified
- add builder tests for the negative path cases where builder should error
- fix bug with GenerateSnapshot where we didn't check for a targets to be loaded when generating for the first time

This also adds some negative path tests (cases in which the builder errors due to invalid input or things not being loaded)

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:58 -07:00
Ying Li
d1ccf0048d Remove signed.Verify in favor of just using signed.VerifySignatures,
signed.VerifyVersion, and signed.VerifyExpiry.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:58 -07:00
Ying Li
aba6317da0 Remove SetRoot, SetTargets, SetTimestamp, and SetSnapshot on tuf.Repo.
Builder is the only one that sets them now.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:58 -07:00
Ying Li
5acab543e4 Update the client to have an old builder and a new builder, and to only use
cached version numbers to check downloaded version numbers of cached data
validates against the old builder.

This also removes the `GetRepo` function of the builder and adds some data
accessors instead that are necessary to do a consistent download and check
versions, that way the downloader doesn't need to fish around in the repo
itself for data in order to figure out what to download.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:58 -07:00
Ying Li
04ec865b31 Update all the server validation and generation code to use the builder.
This means that the server cannot accept any roots not signed by an
x509 key whose GUN doesn't match the GUN being updated.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:58 -07:00
Ying Li
82c88e95a5 Convert bootstrap repo to use the builder
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:57 -07:00
Ying Li
5f3eaf411b Update the downloading client to use the builder.
Delete the remaining TUF client download tests because they are already covered by
the client update tests.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:57 -07:00
Ying Li
a34e2e1dd1 Introduce a builder which builds a TUF repo object, which can be used by
the downloading client and the server validation.  This will hopefully unify
server and client validation.

Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-27 10:58:57 -07:00
Ying Li
2874955337 Merge pull request #693 from docker/remove-certstore
Remove certstore
2016-04-27 10:58:37 -07:00
Richard Scothern
6a992e1348 Merge pull request #1675 from sergeyfd/master
Fix wording for dry-run flag in usage message for garbage collector.
2016-04-27 10:08:53 -07:00
moxiegirl
861815a325 Merge pull request #22229 from riyazdf/notary-doc-update
Update DCT docs with 1.11 info, fix typos
2016-04-27 09:59:30 -07:00
Riyaz Faizullabhoy
77da3bcb72 Update DCT docs with 1.11 info, fix typos
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-27 09:57:54 -07:00
Michael Holzheu
97f45bd629 Dockerfile.s390x: Add upstream libseccomp to compile runc
The runc compile currently fails on s390x:

 Step 35 : RUN set -x    && export GOPATH="$(mktemp -d)" && git clone
 https://github.com/opencontainers/runc.git
 "$GOPATH/src/github.com/opencontainers/runc"       && cd
 "$GOPATH/src/github.com/opencontainers/runc"      && git checkout -q
 "$RUNC_COMMIT"  && make static BUILDTAGS="seccomp apparmor selinux"     &&
 cp runc /usr/local/bin/docker-runc

 [snip]

 # github.com/seccomp/libseccomp-golang
 Godeps/_workspace/src/github.com/seccomp/libseccomp-golang/seccomp.go:25:22:
 fatal error: seccomp.h: No such file or directory
  // #include <seccomp.h>

The problem is that the installed libseccomp version in trusty is too old.

Fix this and install version 2.3.0 of libseccomp like it is done in the
x86 Dockerfile.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-04-27 18:57:15 +02:00
Nathan LeClaire
ade83aa4d5 Bump to version 1.11.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-27 09:54:00 -07:00
Daniel Nephin
b9135646d6 Update the binary name in docker-engine-selinux/docker.fc.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-27 11:41:21 -04:00
Hao Zhang
8fec7c26d4 update cgroup link in doc of run
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2016-04-27 08:50:46 -04:00
Doug Davis
1e44bba4af Remain extra \n on INFO log msg
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-04-27 05:19:40 -07:00
Vincent Demeester
d6176bb03a Merge pull request #22137 from HackToday/addevents
Add load/save image event support
2016-04-27 12:58:49 +02:00
Xian Chaobo
f39ac0e2c2 add support ps --filter volume
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2016-04-27 15:10:54 +08:00
Riyaz Faizullabhoy
60c225b361 Type check on testutil key types
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 22:19:52 -07:00
Sun Hongliang
b5a74ee875 close http response body to avoid potential memory leak
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 12:14:36 +08:00
Zhang Wei
a0191a2341 Remove WaitRunning
Remove function `WaitRunning` because it's actually not necessary, also
remove wait channel for state "running" to avoid mixed use of the state
wait channel.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-27 11:36:47 +08:00
Serge Dubrouski
32193bdcf0 Fix wording for dry-run flag in useage message for garbage collector.
Signed-off-by: Serge Dubrouski <sergeyfd@gmail.com>
2016-04-26 19:44:23 -06:00
Kai Qiang Wu(Kennan)
0656105710 Add load/save image event support
For every docker load and save operations, it would log related
image events.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-27 01:11:03 +00:00
Dongluo Chen
d0bc1833d0 Merge pull request #2165 from nishanttotla/change-of-context
Change context.TODO() to context.Background()
2016-04-26 17:49:20 -07:00
Brian Goff
1521a41fc5 centos:7/OL:7 now includes libseccomp 2.2.1
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-04-26 20:48:26 -04:00
Sun Hongliang
8cca29e9a9 add NodeID in docker info
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-27 08:30:30 +08:00
Brian Goff
0147164cfd Merge pull request #22329 from runcom/fix-tmpfs-order
daemon: reorder mounts before setting them
2016-04-26 20:23:13 -04:00
Riyaz Faizullabhoy
2a3c301274 Update and rebase
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 17:04:48 -07:00
Riyaz Faizullabhoy
1976982685 Use ErrRootRotationFail when checking new root against old keys
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 17:00:12 -07:00
Riyaz Faizullabhoy
ed1bf1a0a6 Address review comments
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 17:00:12 -07:00
Riyaz Faizullabhoy
ca9fc99ba5 Goodbye Certstore
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 17:00:09 -07:00
Riyaz Faizullabhoy
01bbd532c6 Update update logic to error out on corrupted previous root metadata
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 16:59:22 -07:00
Riyaz Faizullabhoy
5901c87feb Update tests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 16:59:22 -07:00
Riyaz Faizullabhoy
9da40f07da Foundation for removing certstore
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-04-26 16:59:22 -07:00
Michael Crosby
2b97201e0c Merge pull request #22181 from Microsoft/jjh/workdir
Windows: Consistent build workdir handling
2016-04-26 16:51:09 -07:00
John Howard
a8c5ba7517 Merge pull request #21384 from Microsoft/10662-IOResourceControls
Add IO Resource Controls for Windows
2016-04-26 15:54:52 -07:00
John Howard
0433801093 Windows: Consistent build workdir handling
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 15:32:52 -07:00
Ying Li
dc445b4a3a Merge pull request #697 from aaronlehmann/cosmetic
trustmanager: Minor cosmetic source code fixes
2016-04-26 15:28:53 -07:00
Josh Hawn
e4dd3359cc Regulate filesystem driver to max of 100 calls
It's easily possible for a flood of requests to trigger thousands of
concurrent file accesses on the storage driver. Each file I/O call creates
a new OS thread that is not reaped by the Golang runtime. By limiting it
to only 100 at a time we can effectively bound the number of OS threads
in use by the storage driver.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

Signed-off-by: Tony Holdstock-Brown <tony@docker.com>
2016-04-26 14:44:13 -07:00
Andrew Hsu
09a9b0cf90 separate the go/non-go imports and reorder
Signed-off-by: Andrew Hsu <andrewhsu@acm.org> (github: andrewhsu)
2016-04-26 14:33:54 -07:00
John Starks
57aef3b490 Windows: Support running dockerd as a service
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-26 14:04:47 -07:00
Nishant Totla
c70f836e88 Remove type unnecessary type conversion
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-04-26 13:42:17 -07:00
Nishant Totla
5cb4faad2b Merge pull request #2171 from allencloud/add-return-when-getting-an-httpError
return immediately when getting an httpError to avoid response mixture
2016-04-26 13:07:20 -07:00
Ahmet Alp Balkan
0376230a5f azure: create temporary file next to destination
We were doing atomic file writes by writing to /tmp
and moving to the actual destination, however some filesystems
do not support copying from /tmpfs.

Bumping the `go-autorest` dependency version to latest.

Fixes #3313.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-26 12:40:10 -07:00
Aanand Prasad
7ad7eb71ca Merge pull request #3164 from aanand/fix-config-v1
WIP: Fix output of 'config' for v1 files
2016-04-26 20:34:18 +01:00
Brian Goff
4925fcbe2e Merge pull request #22324 from WeiZhang555/fix-test-case
Fix test case
2016-04-26 15:01:02 -04:00
Joffrey F
d3e645488a Define WindowsError on non-win32 platforms
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 11:40:31 -07:00
Alexander Morozov
d3d591c536 Merge pull request #22276 from Microsoft/jjh/dockerd
Move docker and dockerd main packages in directories with same name, under `cmd/`
2016-04-26 11:24:01 -07:00
Aanand Prasad
756ef14edc Fix format of 'restart' option in 'config' output
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00