1
0
mirror of https://github.com/docker/cli.git synced 2026-01-29 18:02:11 +03:00
Commit Graph

20395 Commits

Author SHA1 Message Date
Bartłomiej Piotrowski
80f16b65b6 mkimage-arch: use mktemp to create ROOTFS directory
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: c138c335a5d867d81231fdca6f418a9cc11ca244
Component: engine
2014-01-21 14:21:43 +01:00
Alexander Larsson
0341842338 archive: Always end directory filenames in tars with /
This matches what tar does, and without it the tarsum created
by the registry will not match the docker one.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: f918fca3bf77ebe5845593281382f68e5b166ab3
Component: engine
2014-01-21 12:52:05 +01:00
Alexander Larsson
bb99a3bd7b aufs: Unmount inactive devices
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().

This means we avoid littering the system with lots of mounts
and free resources related to them.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 5fe26ee426b9d748605c538829f30885462ad932
Component: engine
2014-01-21 11:26:11 +01:00
Alexander Larsson
4d1276ba85 devicemapper: Unmount inactive devices
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().

This means we avoid littering the system with lots of mounts
and active devicemapper devices and free resources related
to them.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

asdfljk
Upstream-commit: 886f650d9b2133fb61e7cc5b0bb7795246852026
Component: engine
2014-01-21 11:26:11 +01:00
Alexander Larsson
36def61b75 Remove container.EnsureMounted
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 191aa17d16c0935a7deda03b4c3bc879f7a316eb
Component: engine
2014-01-21 11:26:11 +01:00
Alexander Larsson
5e35604785 Add Put() to graphdriver API and use it
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bcaf6c2359d83acd5da54f499e21f4a148f491c5
Component: engine
2014-01-21 11:25:37 +01:00
Alexander Larsson
fbccc581db integration: Fix TestGetContainersExport
The tar changes made the name of the file in the tar archive
change from  "./test" to "test", update the test to the new name.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bde2d3aef7715814920a07d2c5e08d14eabe3e53
Component: engine
2014-01-21 10:41:08 +01:00
Alexander Larsson
62292fd956 Fix handling of shared roots
If rootIsShared() is detected we apply the shell stuff to early, before
the real command and arguments are added to the parameters. This
means they get passed on to unshare rather than docker-init, breaking
docker on e.g. fedora like:

goroutine 1 [running]:
runtime.panic(0x678340, 0x9b3fd7)
	/usr/lib64/golang/src/pkg/runtime/panic.c:266 +0xb6
github.com/dotcloud/docker/execdriver/lxc.func·001(0xc21000a1b0, 0xc21001eab0, 0x7fff24715faf)
	/home/alex/vcs/go/src/github.com/dotcloud/docker/execdriver/lxc/driver.go:41 +0x525
github.com/dotcloud/docker/sysinit.executeProgram(0xc21000a1b0, 0xc21000a1b0, 0xa)
	/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:34 +0xca
github.com/dotcloud/docker/sysinit.SysInit()
	/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:88 +0x791
main.main()
	/home/alex/vcs/go/src/github.com/dotcloud/docker/dockerinit/dockerinit.go:14 +0x1a

The fix is to construct the full params array before escaping it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 08ab55419549374742bc879261f1d55b19af7265
Component: engine
2014-01-21 10:22:13 +01:00
Solomon Hykes
7cb035c53d docs: harmonize intro paragraph with website
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: fdf43f5de14e1ddf9e806e78f51e98721b920b5d
Component: engine
2014-01-21 07:33:26 +00:00
Solomon Hykes
f0d14c9de1 Docs: fix capitalization of "Docker"
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ae2af201f340420f70ca05d54d150764bd88e680
Component: engine
2014-01-21 07:27:55 +00:00
Charles Lindsay
17cbc16b08 Re-add Flavor to KernelVersionInfo
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: b78ae3b652d609a895cf36886e053124d2f8ae80
Component: engine
2014-01-20 21:26:23 -08:00
Charles Lindsay
e8c0aaecc5 Use Sscanf instead of regexp
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: 5b97e00438b094db608f350732f7e4d426c50999
Component: engine
2014-01-20 21:02:37 -08:00
Roberto G. Hashioka
26150f85df - Ajusted server.go with gofmt
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
Upstream-commit: d16691e3ad520675752ff319be054e688c50c475
Component: engine
2014-01-21 04:11:40 +00:00
Roberto G. Hashioka
2b1cc6e037 Added missing attributes to api search calls:
- Added an argument to the call() method in order to control the auth sharing
- Enabled it only for search. Pulls and pushes were enabled already.
- Grouped a few variable declarations

Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
Upstream-commit: 2cfd696b9bacda67468a0a2ef93d61258781e8bc
Component: engine
2014-01-21 04:06:19 +00:00
Charles Lindsay
3fbfa38dfc Fix apparent typo
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: 14b2b2b7c2db83ef1413a7469608f655cd15958e
Component: engine
2014-01-20 19:49:40 -08:00
Charles Lindsay
185397ce27 Remove Flavor from KernelVersionInfo
Also change to parsing it with regexp to keep things simple.

Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: d2c9c1036b94b0c3e7fa3f591fa83f9c95f49406
Component: engine
2014-01-20 19:49:39 -08:00
Charles Lindsay
7e4afd3263 Add failing test for odd kernel version
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: fc30346086a890687d145c33aa8fb3d0ad6a4b7e
Component: engine
2014-01-20 19:49:39 -08:00
Tianon Gravi
8056a9e2e7 Merge pull request #3662 from tianon/add-udev-to-deb
Add udev rules file to our generated deb package
Upstream-commit: a37ffa4041cb8504741ab2805d16f8b268772793
Component: engine
2014-01-20 19:44:05 -08:00
Solomon Hykes
3b8064670d Docs: move advanced topic "create your own base image" out of basic user guide
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c24d128bb545e292ffb0790d8ad3652f56d62b44
Component: engine
2014-01-21 03:43:16 +00:00
Solomon Hykes
5aafcb2d29 docs: "first steps with docker" is a better title than "learn basic commands"
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 589e1a9bdce47d87870c64c5449002bca2b315a4
Component: engine
2014-01-21 03:43:16 +00:00
Solomon Hykes
61cb59e7c7 docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 76eee50a67732ee18a678ebf54720b78370254df
Component: engine
2014-01-21 03:43:16 +00:00
Solomon Hykes
f8b7a24843 docs: move a sysadmin-focused topic out of the basic usage manual and into installation docs (setting up a user group for non-root access)
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: cf5504eed50f01797646079ab849260ec16cd5a2
Component: engine
2014-01-21 03:43:16 +00:00
Solomon Hykes
3c8e9b6ca8 docs: simplify basic usage doc, step 1: check your docker install
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: cf1781608326e9e3ce090383259bbc26d43c49d6
Component: engine
2014-01-21 03:43:16 +00:00
Solomon Hykes
cbf7c3189e Remove myself as sole maintainer of api reference docs.
Please still ping me before changing APIs :)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1fe426641d30b5cde4adc826b3112468a4b10559
Component: engine
2014-01-20 18:49:13 -08:00
Solomon Hykes
e4c7dc13cd Remove Ken from docs maintainers (he's busy on other things)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 230554695ad083048268cbf0fd1364cabdaddce8
Component: engine
2014-01-20 18:48:59 -08:00
Andy Rothfusz
1f774297a3 Reordering to make FAQ last
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
2014-01-20 17:11:03 -08:00
Andy Rothfusz
1665fbf899 Merge pull request #3618 from shykes/docs-cleanup-install
Docs cleanup install
Upstream-commit: acf43b4da7c7f81f5774f341828b8b862f204c04
Component: engine
2014-01-20 17:10:02 -08:00
Andy Rothfusz
59aa210c0d Merge pull request #3600 from SvenDowideit/ghost-status-doc
Ghost status doc
Upstream-commit: b38d3154c85bf66db7c84df58ce5c24696a841b5
Component: engine
2014-01-20 16:51:47 -08:00
Victor Vieux
ddaed73849 update todo
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 497e7d651a21fb1fa0d78221c274871a757a1dc0
Component: engine
2014-01-20 16:09:07 -08:00
Guillaume J. Charmes
5b95959a09 Rename Process to Command
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 12468f2bc8a72a6bedfd681084863ea95b48713b
Component: engine
2014-01-20 16:05:07 -08:00
Victor Vieux
6ba2547fb5 Merge pull request #3442 from DevTable/master
Fix support for registry auth with Dockerfile build.
Upstream-commit: ffe78e82c3e1288285266d9aeae387935b528777
Component: engine
2014-01-20 15:50:14 -08:00
Jake Moshenko
145ef0e1f4 Fix support for registry auth with Dockerfile build.
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05:00
Michael Crosby
d34a852586 Merge pull request #3685 from pnasrat/3679-cgroups-outside-lxc
Move Resources into exec driver 
Upstream-commit: 37c1c7cf7ae2148fc1b87c27f5bc6828787b299b
Component: engine
2014-01-20 15:35:06 -08:00
Guillaume J. Charmes
3f3b1f9fb2 Merge pull request #3684 from crosbymichael/push-multiple-tags
Push multiple tags for repository
Upstream-commit: c2501942cfb5a169d40fd6e445e336ac3bc8c303
Component: engine
2014-01-20 15:24:53 -08:00
Solomon Hykes
28daf949e1 docs: reuse official dependencies list from packager's guide for custom binary install docs
Upstream-commit: 45e8d1f4c0366c5372229db20b95b70badc92119
Component: engine
2014-01-20 23:17:40 +00:00
Solomon Hykes
aec4036475 docs: remove out-of-date kernel requirements document.
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4e54dd245a5e20b86f305ccb8f493d7f17317c50
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
d1c858864a docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: dd786eefbbf286ca57b52374a6905c1ac8b8bd60
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
07e461cf30 docs: change topic of windows install docs to 'install docker on windows'
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 29e6868cc36356393730ff2a5ae4506ac2d162e1
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
61d0a6b6c9 docs: move 'vagrant' install docs to the more accurate 'mac' install docs
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c56e3b8569caa8db6fb7372c7a5f5153eb5d63b7
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
19a30043af docs: move security article to a new 'articles' section
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: d8a71635d4eb6b3dbe0102ab6e177bff8ff5dbec
Component: engine
2014-01-20 23:11:30 +00:00
Paul Nasrat
5de2521000 Don't expose cgroups via the execdriver API.
Use Resources to represent container limits rather than a cgroup specific field.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 71c1646ba33da9b2567ad7a2f4cda0433c9718dd
Component: engine
2014-01-20 17:06:24 -05:00
Michael Crosby
bcfdc65951 Merge pull request #3681 from pnasrat/extract-cgroups-pkg
Extract cgroups into pkg sub dir
Upstream-commit: fbd374f30b11a39ea24a7f3fddb6a50329e4ddd7
Component: engine
2014-01-20 14:00:44 -08:00
Andy Rothfusz
28e9f7be0b Merge pull request #3650 from tianon/fix-doc-man-generation
Fix docs man page generation and add Dockerfile man page
Upstream-commit: 6dfbbaa4ffa91764ad4c332808d3cc9f76aa37b4
Component: engine
2014-01-20 13:44:01 -08:00
Michael Crosby
4963d0d960 Make sure new repositories can be pushed with multiple tags
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a2aab7757e236a895abf7b06836d8e3b84236429
Component: engine
2014-01-20 13:39:35 -08:00
Alexander Larsson
e14eb95c77 hack: Remove GNU Tar requirement
We no longer call out to tar, so this is not needed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 8a4824d1ad2fafd158fbaad52a658c5fd3f7de30
Component: engine
2014-01-20 20:35:16 +01:00
Tianon Gravi
1c3b8811ea Fix Travis build errors by bumping our python module versions to be newer
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6ed9b06e072888d1e7bd60106f17371a89b668a4
Component: engine
2014-01-20 12:30:18 -07:00
Alexander Larsson
f075178b2b Implement TarFilter in go, rather than calling out to tar
This uses a plain filepath.Walk + addTarFile to create a tar file,
optionially compressing it with gzip.

Unfortunately go only has gzip compression support, not bzip2 or xz.
However, this is not a regression, as docker currently uses *no*
compression for TarFilter(). The only compression of tarfiles
currently happens in utils/tarsum.go, and that manually does gzip
compression.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 5ea48aa7f8d3839877b869fdfcea2d5de0972fbf
Component: engine
2014-01-20 20:26:20 +01:00
Alexander Larsson
2a219597ed Simplify addTarFile
We can use tar.FileInfoHeader to do much of the work.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bab8efbf050e1bc2d5c2ff64c6161ef4d323bc3f
Component: engine
2014-01-20 20:26:20 +01:00
Alexander Larsson
0762ca65d0 archive: Extract code from ExportChanges to addTarFile()
This is the code that takes a normal file and adds it to a TarWriter.
We extract it so that we can share it with Tar().

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 5b77e51e0a15eddefcb40380673df8c0c24f95d1
Component: engine
2014-01-20 20:26:20 +01:00
Alexander Larsson
e8d9d10625 archive: Remove unused features
This simplifies that code that calls out to tar by removing support
for now unused features.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 4fb1db7f742fb34a7a06621d0698063de87a572c
Component: engine
2014-01-20 20:26:20 +01:00