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
Nathan LeClaire
736e485782 Update some driver/plugin-related documentation
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 19:00:34 -08:00
Nathan LeClaire
1bdedc6ea2 Add -n to get port number for netstat
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 18:24:44 -08:00
Kenjiro Nakayama
84781a5df7 docker info suppports case-insensitive proxy env settings
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
2015-11-18 10:58:19 +09:00
Daniel Nephin
2f20dfe508 Merge pull request #2409 from dnephin/fix_the_build
Fix texttable dep. 0.8.2 was removed from pypi.
2015-11-17 20:06:40 -05:00
Alexander Morozov
c00c64c20e Merge pull request #18047 from aaronlehmann/push-fix
Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
2015-11-17 17:03:13 -08:00
Nathan LeClaire
a0b75d1645 Merge pull request #2214 from nathanleclaire/delete_bridge
Delete bridge after powering daemon down
2015-11-17 16:56:35 -08:00
moxiegirl
c83373112c Merge pull request #17986 from bogdangrigg/master
Fix small typos in documentation files
2015-11-17 16:45:38 -08:00
moxiegirl
2ee56ce1e1 Merge pull request #18011 from lrkwz/patch-1
Update ubuntulinux.md
2015-11-17 16:44:33 -08:00
Nathan LeClaire
96404cba4e Merge pull request #2306 from ngauthier/fix-host-nil-swarm-options
skip printing swarm info when host options swarm info is nil
2015-11-17 16:40:51 -08:00
Michael Crosby
3f508f08de Merge pull request #17261 from mountkin/remove-unused-daemon-config
remove the unused DefaultNetwork member from daemon.Config
2015-11-17 16:33:11 -08:00
Alexander Morozov
662b9623c1 Merge pull request #17866 from shekhargulati/patch-1
added rx-docker-client library
2015-11-17 16:15:15 -08:00
Alexander Morozov
90e2459ecb registry/registry.go: simplify logical expression
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 16:12:11 -08:00
Alexander Morozov
e2417e3e92 Merge pull request #17617 from askb/17168_pull_error_fix
Fix for #17168 issue
2015-11-17 16:10:44 -08:00
Aaron Lehmann
0ab6b1d922 Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent
This fixes an issue where two images with the same filesystem contents
and configuration but different remote IDs could share a v1Compatibility
file, resulting in corrupted manifests.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-17 16:05:09 -08:00
Alexander Morozov
a935359ec7 Merge pull request #17294 from zhangjianfnst/16756-integration-cli-checkers-cp
Use checker assert for integration-cli/docker_cli_cp_*  four files.
2015-11-17 16:00:00 -08:00
Alexander Morozov
92ea146790 Merge pull request #17452 from aditirajagopal/16756-docker_cli_by_digest_test
Checkers on docker_cli_by_digest_test
2015-11-17 15:58:05 -08:00
Alexander Morozov
346d195f6a Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
Add zsh completion for log options
2015-11-17 15:53:31 -08:00
Michael Crosby
53556183c7 Merge pull request #17434 from little-arhat/fix/newlines-in-json-status
Add newlines to FormatProgress for JSON as well
2015-11-17 15:52:31 -08:00
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
2015-11-17 15:44:57 -08:00
Alexander Morozov
adce1981f4 Merge pull request #17593 from daehyeok/refactoring_json_log
Refactoring json log driver
2015-11-17 15:38:52 -08:00
Daniel Nephin
265828f4eb Fix texttable dep. 0.8.2 was removed from pypi.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-17 18:36:58 -05:00
Michael Crosby
ca0b41e337 Merge pull request #18000 from daehyeok/fix_dry_run_test
Modified cpuset test for unicore test environment
2015-11-17 15:15:09 -08:00
Michael Crosby
7147ac6ce7 Merge pull request #18023 from LK4D4/goodbye_dind
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
Nathan LeClaire
8d19826c38 Merge pull request #2311 from trecloux/1891-support_ubuntu_15.04_and_higher
Introduce support for ubuntu 15.04 and higher
2015-11-17 14:49:59 -08:00
Stefan J. Wernli
d860ff79a0 Windows: hacking around content addressable IDs for temporary fix.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-11-17 14:03:36 -08:00
Ben Hamill
5707b38a9e Replace - with _ in bash completion identifiers.
Signed-off-by: Ben Hamill <git-commits@benhamill.com>
2015-11-17 15:20:29 -06:00
Daehyeok Mun
a9afebae62 Modified cpuset test for unicore test environment
Modified TestInspectApiCpusetInConfigPre120 and
TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu
environment.

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-11-17 13:28:09 -07:00
Jess Frazelle
aeccd45e5b Merge pull request #17419 from nathwill/cent-install-docs
fix yum install docs
2015-11-17 20:57:15 +01:00
Alexander Morozov
70ce2d9b10 Skip apparmor tests on User Namespace
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-17 11:49:31 -08:00
Alexander Morozov
d3744fbeb1 Merge pull request #18002 from Microsoft/10662-registerlinks
Windows: Disable links
2015-11-17 11:48:53 -08:00
Eric Windisch
0df0b6b443 Revert "Skip TestAppArmorDeniesChmodProc"
This reverts commit 04e1015aa0.

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-11-17 11:46:42 -08:00
Eric Windisch
1bf5fcd911 Revert "Skip TestRunUnshareProc"
This reverts commit 03dce24137.

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-11-17 11:46:42 -08:00
Michael Crosby
e58b0bba7f Merge pull request #18024 from LK4D4/simple_byparent
graph/graph.go: simplify appending to slice in map in byParent
2015-11-17 11:45:24 -08:00
Michael Crosby
1ecb9a40db Merge pull request #17974 from anusha-ragunathan/fsMagic
Fix devmapper backend in docker info
2015-11-17 11:44:48 -08:00
Alexander Morozov
9187656305 Merge pull request #16639 from mrunalp/skip_dev_setup
Skip /dev setup in container when it is bind mounted in
2015-11-17 11:36:00 -08:00
Michael Crosby
19debeb255 Merge pull request #18027 from tpounds/fix-err-message-typo
Fix error typo when --expose and --net are specified
2015-11-17 11:34:40 -08:00
Michael Crosby
d0696ab7f6 Merge pull request #18028 from LK4D4/carry_17174
Use /usr/lib/os-release if /etc/os-release is missing.
2015-11-17 11:26:24 -08:00
Michael Crosby
68336bc832 Merge pull request #18043 from tianon/freebsd-package-name
Fix "./docker" package name on freebsd
2015-11-17 11:17:26 -08:00
Alexander Morozov
4dda67b801 Merge pull request #16452 from rhatdan/btrfs-selinux
Relabel BTRFS Content on container Creation
2015-11-17 11:03:40 -08:00
Antonio Murdaca
8fff64fe4f Merge pull request #18044 from tianon/a.out
Prevent the creation of "a.out" at the repo root
2015-11-17 20:00:07 +01:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info
Patch for Plugin drivers in docker info
2015-11-17 10:46:29 -08:00
Alexander Morozov
e55274e3fe Merge pull request #18014 from calavera/make_normalize_local_name_local
Make NormalizeLocalName to not reach the network to normalize names.
2015-11-17 10:23:41 -08:00
Tianon Gravi
7f608c391d Prevent the creation of "a.out" at the repo root
Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-17 09:44:36 -08:00
Tianon Gravi
e54c4517a7 Fix "./docker" package name on freebsd
This fixes "can't load package: package ./docker: found packages client.go (main) and daemon_freebsd.go (docker)"

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-17 09:38:19 -08:00
gissehel
741246d69f Remove redundent lines
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
2015-11-17 18:24:17 +01:00
Alexander Morozov
71f422435e Merge pull request #17999 from tianon/linkmode-external
Remove "-linkmode external"
2015-11-17 08:33:32 -08:00
Jess Frazelle
1c8d8b3012 Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
Add initial support for Docker on ARM
2015-11-17 16:52:54 +01:00
David Calavera
d507acb175 Merge pull request #17724 from runcom/remove-depreciated-cli-flags
Remove depreciated cli flags
2015-11-17 16:40:06 +01:00
GoBella
c16dd88c5e "Assert change"
Signed-off-by: GoBella <caili_welcome@163.com>
2015-11-17 18:40:18 +08:00
Thomas Recloux
4457dce51d Introduce support for ubuntu 15.04 and higher
Starting with version 15.04, ubuntu is based on systemd. The existing
ubuntu provider did not support systemd.

This commit introduce a new provider dedicated to systemd based
versions.

The previous provider is renamed to ubuntu_upstart.

Provider detection uses the /etc/os=release VERSION_ID.
Version ID is converted to a float value and then used to choose between
providers.

Unit tests are validating the provisioner compatibility.

Fixes #1891

Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com>
2015-11-17 11:21:41 +01:00