Commit Graph

15109 Commits

Author SHA1 Message Date
53e65f3de7 Merge pull request #13830 from clnperez/check-apparmor-file-first
Check for apparmor file before reading it
Upstream-commit: fc793bf1a3bbdd93fc674afc02bad9d64c97bfb8
Component: engine
2015-06-18 08:18:01 -04:00
c6caf278a1 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
88ce8cdf94 Merge pull request #13991 from LalatenduMohanty/adding_new_scientists
Proposing Chandrasekhar, Khorana, Saha for name-generator
Upstream-commit: baa166447858619727b17bdf6ea082b7e5545415
Component: engine
2015-06-17 21:06:24 -04:00
42b7264397 Merge pull request #13070 from shishir-a412ed/cleanup_cmd_tag
Use distribution's ValidateRepositoryName for remote name validation. 
Upstream-commit: 206acbcf89d2f499b4c8423fb121516d88226a24
Component: engine
2015-06-17 23:26:27 +02:00
b387e8ade7 Merge pull request #13575 from mattmoor/consistent-push-fallback
Make v2 push have v1-fallback behavior consistent with pull.
Upstream-commit: d86345b9f722c187afd4af8a92583fc07506b5d9
Component: engine
2015-06-17 13:41:58 -07:00
40e0bc3295 Merge pull request #13988 from runcom/fix-old-code-path-removal
Remove missed code path for api < 1.12
Upstream-commit: af845d42a586493c5f298b47952bbf59f563307e
Component: engine
2015-06-17 12:30:11 -07:00
0b8d2a4fe1 Merge pull request #13870 from lindenlab/pull-single-tag
Only request a single repository tag when pulling a specific image:tag
Upstream-commit: c107e9d7903d148692f9e727bf6d5ce6e88e2f72
Component: engine
2015-06-17 15:29:39 -04:00
9119e297bd Proposing Chandrasekhar, Khorana, Saha for name-generator
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
Upstream-commit: 3fa2ddc452953e0695eda7cda191358010866c7e
Component: engine
2015-06-18 00:52:29 +05:30
bb369494dd Use distribution's ValidateRepositoryName for remote name validation.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: b8301005ffe66fb15a64735deeae707595543a92
Component: engine
2015-06-17 15:15:16 -04:00
94d7dd0cf8 Merge pull request #13896 from rhvgoyal/verify-base-uuid
devicemapper: Compare uuid of base device on startup
Upstream-commit: 85d3b75dfddde62bf1c934afd1cd41ee12309223
Component: engine
2015-06-17 11:30:04 -07:00
972f3a5da2 Merge pull request #13893 from mrunalp/update_libcontainer
Updates libcontainer to v2.2.1
Upstream-commit: 010470dd536b2fcd01392c3630131ccf1bc79985
Component: engine
2015-06-17 10:47:49 -07:00
809c6b1b19 Check for apparmor file before reading it
I ran a single integration test and got an error that the file
/sys/module/apparmor/parameters/enabled doesn't exist. I don't have
apparmor installed. So, just check the file first to avoid a confusing
error.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 691ed6ef995b8ee7cf9bdcea29ccf4b58a244234
Component: engine
2015-06-17 11:58:17 -05:00
0903c42bae Merge pull request #13827 from moxiegirl/rpm-rhel-centos-fedora
RPMs update to installation guides
Upstream-commit: 424bb26b6c7d4042acd388c09a6e412178d87271
Component: engine
2015-06-17 08:29:33 -07:00
619b47f09a Remove missed code path for api < 1.12
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: b6a6c56915b836cf9579e3148c7d0b4f72722f06
Component: engine
2015-06-17 17:00:48 +02:00
3bf86db4a9 Merge pull request #13292 from coolljt0725/add_bridge_nf_to_docker_info
Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info
Upstream-commit: 9ad87523c03fb0d313a4170a7f595a95b3d8497b
Component: engine
2015-06-16 22:15:48 -07:00
2d2c80b6fc Merge pull request #13975 from stevvooe/move-setup-init-layer
Move graph.SetupInitLayer to daemon package where it is used
Upstream-commit: a27d8f9aa4dbdbad5bbfd83c8d8321e7a976305c
Component: engine
2015-06-16 22:37:51 -04:00
a2d8dcc9ab Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 57d12a0e0aca49ddd4baad3d37b77f31d63ff70b
Component: engine
2015-06-17 09:19:11 +08:00
f21492c649 devicemapper: Compare uuid of base device on startup
It is easy for one to use docker for a while, shut it down and restart
docker with different set of storage options for device mapper driver
which will effectively change the thin pool. That means any of the
metadata stored in /var/lib/docker/devicemapper/metadata/ is not valid
for the new pool and user will run into various kind of issues like
container not found in the pool etc.

Users think that their images or containers are lost but it might just
be the case of configuration issue. People might use wrong metadata
with wrong pool.

To detect such situations, save UUID of base image and once docker
starts later, query and compare the UUID of base image with the
stored one. If they don't match, fail the initialization with the
error that UUID failed to match.

That way user will be forced to cleanup /var/lib/docker/ directory
and start docker again.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: c06b05b11e6bbe48ae3ca140096d7862e5e312f8
Component: engine
2015-06-16 21:12:27 -04:00
fe0ca49e61 Move graph.SetupInitLayer to daemon package where it is used
An inspection of the graph package showed this function to be way out of place.
It is only depended upon by the daemon code. The function prepares a top-level
readonly layer used to provide a consistent runtime environment for docker
images.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: b7f887a9a24a2df61fa53612ae42b7e9d62fe858
Component: engine
2015-06-16 16:50:56 -07:00
d527901687 Merge pull request #13685 from yuchangchun1/tag_regx
add a more accurate error description for invalid tag name
Upstream-commit: ba9db62e68581b2f9187b15b13150396961e23e9
Component: engine
2015-06-16 16:33:17 -07:00
759c0c7705 First pass of updates
Working docs
Update after check
update to centos 7 after second test
Updating with hopefully correct urls
Adding thaJetzah's comments
Updating with the new images
Updating after a visual check

Signed-off-by: Mary Anthony <mary@docker.com>

Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f9ab04ad13863fca6e7b0f3d519dc9e0b08fc567
Component: engine
2015-06-16 16:29:11 -07:00
70a75c7cfc linting changes
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2f6e4fdb29ba6463bfcded8e919832803d7cdbae
Component: engine
2015-06-17 01:16:57 +03:00
8810db85be Merge pull request #13198 from rhvgoyal/extend-docker-inspect
docker-inspect: Extend docker inspect to export image metadata related to graph driver
Upstream-commit: e69df2589c1220217054abdc6a361b55990b3c0b
Component: engine
2015-06-16 15:03:14 -05:00
a9b211e201 Merge pull request #13970 from cpuguy83/13964_fix_tlsverify_env
Fix DOCKER_TLS_VERIFY being ignored
Upstream-commit: b1f984a29f3fa6b9125e38e6bbd7efa34e814159
Component: engine
2015-06-16 10:24:41 -07:00
7ea6b49842 Merge pull request #13915 from tianon/validate-pkg
Add new "validate-pkg" bundlescript
Upstream-commit: c80256a31d89813000b47f43b69f7b27e36e1a8c
Component: engine
2015-06-16 10:09:11 -07:00
baa23ba245 Merge pull request #13955 from jfrazelle/update-install-script-w-experimental-gpg
add gpg fingerprint for experimental
Upstream-commit: 952d030be228e252897a405b978394e4dfbd4fe5
Component: engine
2015-06-16 12:44:40 -04:00
48bd0d41e3 Merge pull request #13972 from tiborvass/update-go-net
Update vendored go.net to use golang.org/x/net canonical path
Upstream-commit: 2420ef8cf14b612e940843b93ff78a70d18e6215
Component: engine
2015-06-16 09:37:07 -07:00
69ff11d75b Fix DOCKER_TLS_VERIFY being ignored
DOCEKR_TLS_VERIFY was being ignored because we were just checking if the
`-tlsverify` flag was set, not the actual value, which is defaulted to
the value of `os.Getenv("DOCKER_TLS_VERIFY") != ""`

The problem that this specifically fixes is where the client has set the
`DOCKER_TLS_VERIFY` env var but is connecting to a daemon that is not
verifed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5a6a33f7acccc7394a5ac418e777d5a6e1d1b7ed
Component: engine
2015-06-16 12:04:00 -04:00
fa9ff55406 Update vendored go.net to use golang.org/x/net canonical path
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d820e00aac2376d4e01721557b9af5e482ec89cd
Component: engine
2015-06-16 11:40:04 -04:00
1868142b6e Fix circular import for windows vfs graphdriver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 49834e8d5922f8c256124177b188d89007af03f6
Component: engine
2015-06-16 09:08:10 -04:00
8758fd6f1e Remove sources/ under docs directory
See #13936.

Signed-off-by: ChaYoung You <yousbe@gmail.com>
Upstream-commit: 3f4eeca68f49a979e2d0af33a7d89bf3ceb62a73
Component: engine
2015-06-16 19:15:48 +09:00
4dbf1e0f71 Only pulling single repository tag on pull for a specific tag. extending TestGetRemoteTags unit test
Splitting out GetRemoteTag from GetRemoteTags.  Adding registry.ErrRepoNotFound error

Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: b349a74c71fb072f9f23f508b8c698d0590abb12
Component: engine
2015-06-16 07:10:09 +00:00
4c3630993e add gpg fingerprint for experimental
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 957622d452983f14bcc79443c9ff05780e1fd6bf
Component: engine
2015-06-15 18:49:22 -07:00
353eb52eac Merge pull request #13950 from Microsoft/10662-vfsforreal
Windows - Really fix VFS this time
Upstream-commit: 9dffd032f43dca88e8a66685aceb21b0e00cc232
Component: engine
2015-06-15 21:41:12 -04:00
97148c67d5 Merge pull request #13953 from crosbymichael/network-mtu
Get Mtu from default route
Upstream-commit: b81f2ee5f20d094c13893f565ce716595c539d22
Component: engine
2015-06-15 17:13:44 -07:00
9ac0ec70e6 Get Mtu from default route
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface.  If there is no default route, default to a
mtu of 1500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ff4e58ff560d864432261a68502a8a5543145fdf
Component: engine
2015-06-15 16:33:02 -07:00
4c0a7236a3 Merge pull request #13941 from unclejack/fix_umask
docker/daemon: set umask to the default on startup
Upstream-commit: f48fadd05c5e131757ae305693e5b3ccbc539736
Component: engine
2015-06-15 16:19:38 -07:00
3a2506bacc Merge pull request #13947 from mavenugo/vin
Picking up missed out vendor files via hack/vendor.sh
Upstream-commit: 4d23f459adb26deced2843ebb223bd16b5ba3b42
Component: engine
2015-06-15 16:16:02 -07:00
6b78ff756b Merge pull request #13935 from asbjornenge/tm_syntax_updates
TM syntax updates
Upstream-commit: 748814a97a0bade1375ffa9cee6009a823b6d75e
Component: engine
2015-06-15 16:12:22 -07:00
587729eda0 Updates libcontainer to v2.2.1
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 6d022bda3bddb930948fec99ad35c402ac79e8f7
Component: engine
2015-06-15 18:18:38 -04:00
bc9e6b9254 Windows - Really fix VFS this time
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 59cfc089820f6f8a2a5f24ddfcf0fe1328c9568c
Component: engine
2015-06-15 15:09:48 -07:00
d1559e41df Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
Correct the message of pause and unpause a non-running container
Upstream-commit: 835f1c91161db45ed18683b5d75685dea0c5dc2c
Component: engine
2015-06-15 23:56:32 +02:00
4cf65f9e74 Merge pull request #13869 from jlhawn/multi_line_help_usage
api/client: Allow for multi-line usage help
Upstream-commit: 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Component: engine
2015-06-15 14:50:17 -07:00
7262d63bf2 Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
Store layer digests on pull
Upstream-commit: b3b04fd85a5a44182c872a2765e6732bf9f05a39
Component: engine
2015-06-15 14:37:30 -07:00
9a276424db retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
75ce6767dc Picking up missed out vendor files via hack/vendor.sh
while wokring on another PR, I noticed that hack/vendor.sh was picking
up unrelated files. Maybe a previous update to the hack/vendor.sh failed
to run the script and push the vendor changes ?

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dcc4a14ba31ab195f97dcf264835339a1a00e8d5
Component: engine
2015-06-15 11:38:06 -07:00
8b238203a5 Merge pull request #13942 from calavera/fix_unshare_mount_regression
Fix regression bind mounting shared.
Upstream-commit: 3f11e05db2c2efdac0455b693efdacc6fce1ab62
Component: engine
2015-06-15 11:25:35 -07:00
778f11fd97 Store layer digests on pull
Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.

Fixes #13883

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a98ea87e463383a77d7244c78c9da3ac9f2cd086
Component: engine
2015-06-15 11:08:21 -07:00
4a6f8e2e63 docker-inspect: Extend docker inspect to export image/container metadata related to graph driver
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.

This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 407a626be62996cd6385ea4d80e669ab83f5f04d
Component: engine
2015-06-15 14:05:10 -04:00
974ab12463 Revert "contrib/init: unshare mount namespace for inits"
This reverts commit b6569b6b82df4c5e29ee8f5ebd9db7e36919cefd.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d8592eaff8bddb6f29c48cc39dec70db884eda00
Component: engine
2015-06-15 10:35:17 -07:00