Commit Graph
13738 Commits
Author SHA1 Message Date
Ahmet Alp Balkan 62119ca587 Export $HOME lookup to pkg/homedir
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: f9ae2d4fd4c5b4afb7a2299b93a800f718b63a2a
Component: engine
2015-02-06 11:42:45 -08:00
Alexander Morozov 915f96f67c Show right tag for container in ps
Fixes #10599

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e45deceb462351f841aa077819fdef3166381c50
Component: engine
2015-02-06 11:32:01 -08:00
Vincent Batts 084e9ad0b5 pkg/archive: test that confirms hardlink ordering
This test was written against
master(abdfb21e3a761efdd70614de42905ff7911c5372) as a failing test, but
works with this patch set.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 899a2dda097a57a12f8794ded4a706781173aa5d
Component: engine
2015-02-06 18:14:38 +01:00
Vincent Batts 6910db2df7 pkg/archive: sort files
sort changes found and exported.

Sorting the files before appending them to the tar archive
would mean a dependable ordering for types like hardlinks.

Also, combine sort logic used

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 32d6d49539f5876e6ef75f00db917d8a3aaa0569
Component: engine
2015-02-06 18:13:57 +01:00
Doug Davis 7b03f17d1a Remove leading/trailing spaces in builder/parser
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.

Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3859c485317a395de1e8eb48270d0e3b1207a204
Component: engine
2015-02-06 08:52:18 -08:00
Sven Dowideit f3b4b47f92 Documentation on boolean flags is wrong #10517
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1e6e68361c6cc42ab92288e0a0132b14ef6c9426
Component: engine
2015-02-06 19:52:01 +10:00
Sven Dowideit 20a29795dd Do some major rearranging of the fedora/centos/rhel installation docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: eb814e4e703b4676e0cb410052d1145ee9f8628e
Component: engine
2015-02-06 19:48:19 +10:00
Lokesh Mandvekar f31f8c4059 update fedora docs to reflect latest rpm changes
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Upstream-commit: 66839cf3a6718f844e71d2561cc706c95f5629ec
Component: engine
2015-02-06 19:48:19 +10:00
Sven Dowideit 88b86ea3ea Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
The reference menu is too big to list more than the latest API docs, so ...
Upstream-commit: 6081a3ca90f7994ae19d22009e3691de03afad14
Component: engine
2015-02-06 19:26:01 +10:00
unclejack cdd7eba595 docs/articles/systemd: correct --storage-driver
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 0b2f734462df3062acefe4bc4bd14d0604bae286
Component: engine
2015-02-06 10:52:09 +02:00
Chen Hanxiao c62d5ec226 nat: enable upper case proto
We only accepted lower case proto: tcp, udp.
This patch will enable us to use upper case
of proto such as: EXPOSE 1234/TCP

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 270642643452b440b159216d843ea4fc2239ff4f
Component: engine
2015-02-06 14:07:17 +08:00
Katie McLaughlin 1cdd0ecffc Format awsconfig sample config correctly
Reflow change in commit 195f3a3f removed newlines in the config format.

This change reverts the sample config to the original formatting, which
matches the actual config format of a `awsconfig` file.

Signed-off-by: Katie McLaughlin <katie@glasnt.com>
Upstream-commit: df3933621372e6f974801717cbb9fe3846efbfd6
Component: engine
2015-02-06 13:45:10 +11:00
Fred Lifton 8eee87ed67 Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
For now, docker stats appears to be libcontainer only
Upstream-commit: 68b0ed54cb7ed9e4b66e8a9e0708577b32088de2
Component: engine
2015-02-05 17:52:36 -08:00
Derek McGowan e071644a3f Update verification message logic
Only show the verification message if all the tarsum checks pass and the image manifest is verified.
No longer return an error when a tarsum verification fails, just reset the verification flag.
Tarsum verification is less meaningful without a verified manifest and therefore it should not cause an error.
Updated the verified image test to pull an image which expected to have a verified manifest and contents.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 6088df20c33afafa523b9dd9b0acdd3b987c4534
Component: engine
2015-02-05 17:46:55 -08:00
Ahmet Alp Balkan 63b6feced2 Extract $HOME usages into utils.GetHomeDir()
Refactored getHomeDir in docker/docker to GetHomeDir in utils
pkg. Currently covers all use cases on the client-side.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 6ffb77afd4c3705322417f0673d254038f01a187
Component: engine
2015-02-05 16:13:51 -08:00
James Turnbull 9c086aa5c5 Merge pull request #10560 from MihaiB/docs-typo
docs: fix typo
Upstream-commit: eda9c14cb9d3bd6a99ea8badbdb0446cd4c1faf9
Component: engine
2015-02-06 00:42:45 +01:00
Jessie Frazelle 5d2a3cc9ae Merge pull request #10552 from albers/bash-completion
Complete signals in bash completion for docker kill
Upstream-commit: 1c8beeb07af9b779fc635aacce908227e7a25293
Component: engine
2015-02-05 15:35:03 -08:00
Abin Shahab ba0c809ee8 Added /dev paths to layer comparison
Lxc images have /dev (devices). This creates a list with the /dev paths in the test.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: ea0fd0e8e5ba5cccdf5bf0e475a165c4996bd9aa
Component: engine
2015-02-05 20:36:30 +00:00
Ian Babrou b9f1d0a0b4 Checking EXT4_FS_SECURITY and EXT4_FS_POSIX_ACL for overlay
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: a6c6d8bb91a9e2fc2f9bd3da78382112794d17fe
Component: engine
2015-02-05 17:41:13 +03:00
Dan Walsh d61c0e9f91 Turn on Security opts including labeling for docker build
Currently docker build is not passing HostConfig to daemon.Create.
this patch creates the default HostConfig and passes it to daemon.Create.
This will cause the SELinux labeling to turn on for docker build.  Basically
it causes a SecurtyOpt field to be created.  In the future this might also
allow us to use seccomp and UserNamespace with docker build.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 8a8dcf1930cbd3354994938d5f8e420fb3e66d95
Component: engine
2015-02-05 12:33:22 +01:00
Harald Albers a2390c36ad Bash completion for docker kill
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 532513153f64abdda87332b3cf76863dd07bf0ff
Component: engine
2015-02-05 09:42:33 +01:00
James Turnbull a99f7cd89b Merge pull request #10521 from SvenDowideit/docs-not-ready-yet
remove swarm, machine and compose from the 1.5.0 release docs
Upstream-commit: abdfb21e3a761efdd70614de42905ff7911c5372
Component: engine
2015-02-05 03:42:14 +01:00
Fred Lifton f4d8ef933c Merge pull request #10575 from SvenDowideit/elide-dhe-docs
The DHE documentation will not be published with 1.5.0
Upstream-commit: e13a0de7aad0e38725868f8e12fc57cc73ed316f
Component: engine
2015-02-04 18:16:42 -08:00
Fred Lifton 7f4431424b Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
Fix a small spelling error in the dm.blkdiscard docs
Upstream-commit: 6dd2364dc2c6ba0d95a5dc52dae447c80d9af5d0
Component: engine
2015-02-04 17:42:31 -08:00
Fred Lifton dd0b17fb61 Merge pull request #10506 from SvenDowideit/v1.5.0-release-notes
Add an initial list of new features in Docker Engine 1.5.0
Upstream-commit: e19f2c0e52554595bd4fa9069b22728b33990eca
Component: engine
2015-02-04 17:22:11 -08:00
Qiang Huang a56a6166e9 update docs for memory and memoryswap
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0c0f0d5ab41cae62a441502f26c1c300fc61e25d
Component: engine
2015-02-05 09:12:56 +08:00
Qiang Huang c3812a0984 add check for memoryswap when create
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 72f356be6a662ed92e04ba9c58acac63c5a15264
Component: engine
2015-02-05 09:05:27 +08:00
Tibor Vass 2258e00882 Clarify docs review role
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1578f21067b92338c90f15a9a3473137b1db2b99
Component: engine
2015-02-04 19:58:31 -05:00
Sven Dowideit a31c4ae7c4 Fix a small spelling error in the dm.blkdiscard docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Component: engine
2015-02-05 10:57:33 +10:00
Sven Dowideit e5fc776e72 Add an initial list of new features in Docker Engine 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 16a15ea5812e3dce0f23e1f4ac7ac576f45bfeb4
Component: engine
2015-02-05 10:37:15 +10:00
Sven Dowideit e0ecebf764 remove swarm, machine and compose from the 1.5.0 release docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a7a9ce2635e75eb138fc761d8a5bba4156562a8c
Component: engine
2015-02-05 10:30:57 +10:00
Sven Dowideit b2714755f7 The DHE documentation will not be published with 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9867dfa6176c000f1afe25316f67f4d409b2b177
Component: engine
2015-02-05 10:26:53 +10:00
Sven Dowideit 13f79dd103 Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
Upstream-commit: 1cc774b4faebdc11f419add5467a6bc19288bce9
Component: engine
2015-02-05 10:21:00 +10:00
Sven Dowideit 38af1c98bd For now, docker stats appears to be libcontainer only
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 2507e0b64fc037a38bf48405b9a0cce1e56cb7c8
Component: engine
2015-02-05 10:12:05 +10:00
Alexander Morozov 55dbcd816d Merge pull request #10566 from jfrazelle/fix-overlay-unit-tests-for-btrfs
Fix for running unit tests on a 3.18 kernel with btrfs.
Upstream-commit: fd1bdf21206f41de95ebc5310ac00499829a4943
Component: engine
2015-02-04 15:41:06 -08:00
Alexander Morozov 5d5fbc1d01 Change verbose builder out back to attach
This is sort of "revert" of #8415. There is some problems with using
logs:
* Non-live progressbars
* Races when you can try to get logs before it was written(there was
  occasional errors in tests)

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1095d5e5e43654aa27952f131b71c55f18fedc4b
Component: engine
2015-02-04 15:37:14 -08:00
Jessica Frazelle c75462bc54 Removes the feature to pull all image aliases.
It didn't work on v2 anyways. And an image with a lot of aliases was slow to
fetch.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 72a9000fcfa2ec5a2c4a29fb62a17c34e6dd186f
Component: engine
2015-02-04 15:06:34 -08:00
Tibor Vass b11be09469 A few fixes
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 7cbd2d08c0c8b9d6cb2aa2d7e511833bb529462e
Component: engine
2015-02-04 17:14:15 -05:00
Alexander Morozov f18e849aa3 Merge pull request #10565 from jfrazelle/fix-range
Fix compilation on Go 1.3.3
Upstream-commit: 7cc98582233bf9873007d6e6c3d05a4f8fac601b
Component: engine
2015-02-04 14:07:05 -08:00
Jessica Frazelle e15bc1c2fe Fix for running unit tests on a 3.18 kernel with btrfs.
Was failing on overlay before and comparing the wrong error.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c809fc552b65ea90ed695d39c24447aa3dbc7891
Component: engine
2015-02-04 13:51:44 -08:00
Tibor Vass 1d1a344eea New pull request workflow
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 14452bcfc2ba0f98987734c0ec00ee439f71a740
Component: engine
2015-02-04 16:43:09 -05:00
Jessica Frazelle 160a9d328c Fix compilation on Go 1.3.3
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4855612aaecf7719edc36693d402279c743be7fc
Component: engine
2015-02-04 13:35:20 -08:00
Jessie Frazelle ea7f7015a5 Merge pull request #10526 from allingeek/runconfig-user-detail
CLEANUP: Amend run help for --user to include GID
Upstream-commit: 5a5726c5e4cd21b5988f9253f322974f1b0dcd08
Component: engine
2015-02-04 13:23:55 -08:00
Derek McGowan fe554d875d Reduce logging when official v2 registry is unavailable
On pull treat an unavailable v2 registry as a non-error fallback.
On push only show v2 error message in debug mode.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: c8a06069bcee4214cd03468343aec7fcc4a37143
Component: engine
2015-02-04 13:23:13 -08:00
Mihai Borobocea ccc7d51716 docs: fix typo
There are 2 not 3 RUN instructions in the userguide's Dockerfile.

Signed-off-by: Mihai Borobocea <MihaiBorobocea@gmail.com>
Upstream-commit: 48ee443ecaae002cc688c7b03e07ecc670b3b193
Component: engine
2015-02-04 23:15:18 +02:00
Jeff Nickoloff 74b86f866b Amend run help for --user to include GUID
The -u/--user flag optionaly takes a group/gui. This change documents this behavior and specifies the complete format of the value.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>

Added a missed semi-colon for consistency with other messages.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
Upstream-commit: 46d4e491c8a1394596e824ac65b360f6d7211c6f
Component: engine
2015-02-04 21:27:02 +01:00
Jessie Frazelle 8423899da1 Merge pull request #10547 from duglin/Issue10214
Pretty the help text
Upstream-commit: a271eaeba224652e3a12af0287afbae6f82a9333
Component: engine
2015-02-04 11:31:18 -08:00
Fred Lifton 2ac3861c66 Merge pull request #10522 from SvenDowideit/fix-swarm-links
use the same paths as in the swarm repo, so that their links magically w...
Upstream-commit: 8a91926cd90b10e1be097eb2adb2ac58de1889a0
Component: engine
2015-02-04 10:19:19 -08:00
Fred Lifton f36df9e537 Merge pull request #10542 from SvenDowideit/ets-spelling-in-userguide
Spelling mistake in dockerlinks
Upstream-commit: a1ce6c7d444cd6534e190e77d920243d3776796d
Component: engine
2015-02-04 10:17:52 -08:00
Arnaud Porterie dcd5286270 Merge pull request #10539 from dmcgowan/v2-registry-revert-push
Revert push to v2 official registry
Upstream-commit: 23196cdebbaabf00d54db56d5587feff975ca8ff
Component: engine
2015-02-04 10:01:26 -08:00