toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,716 Commits 3 Branches 295 Tags
2f262fa249c53c2bc66bdfeb246040777179ee00
Commit Graph
19716 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Calavera 7cc6faffed Merge pull request #17738 from Microsoft/jjh/login 
Windows: [TP4] Fix docker login
Upstream-commit: f1983344001df0f598e75cc68367899191421ea9
Component: engine
 2015-11-06 15:02:42 -08:00
David Calavera d3e1496300 Merge pull request #17751 from guilhem/patch-1 
Fix missing `-d` flag in docker.fish
Upstream-commit: 754c2e08b774ab7a468e85ef654d34b2c5d925e6
Component: engine
 2015-11-06 14:59:30 -08:00
Vincent Demeester 592b2afbd0 Merge pull request #17767 from LK4D4/nice_logs_message 
Return nice client-side message for docker logs
Upstream-commit: 2d87403704f78ceec9c2eed10bbaa82cffb2bd86
Component: engine
 2015-11-06 23:51:05 +01:00
John Howard 55ab290410 Windows [TP4] localhost mitigation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: eb2acb8f0e58a0007434341e9e011010594b288e
Component: engine
 2015-11-06 13:52:59 -08:00
Vincent Demeester 900059747c Use checker for docker_cli_run_unix_test.go 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7a82429b3d0fc7a93f61406117c170aaf9a4f9be
Component: engine
 2015-11-06 22:49:16 +01:00
moxiegirl 193b8e63c7 Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo 
Revise commands in Compose section of multi-host quickstart
Upstream-commit: 8aa8d51610f509bbdbbe8409523da575d4907d28
Component: engine
 2015-11-06 13:04:43 -08:00
Alexander Morozov 0791fd443d Return nice client-side message for docker logs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e37e329074517f48db8468affc62beb595ab090e
Component: engine
 2015-11-06 11:40:48 -08:00
Tonis Tiigi 8bd20475ee Fix symlink handling in builder ADD/COPY commands 
Fixes #17290

Fixes following issues:

- Cache checksums turning off while walking a broken symlink.

- Cache checksums were taken from symlinks while targets were actually copied.

- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 47da59f7ec4ee0f49d47a9b32abb137bb30b2c48
Component: engine
 2015-11-06 10:58:12 -08:00
Alexander Morozov cd606dc8e8 Use name instead of container in Commit 
It will make daemon interface separation easier later.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 38e34cf6da505ad38f0c4cc2b830becdcf67c58a
Component: engine
 2015-11-06 10:22:00 -08:00
Alexander Morozov aaf8bba9c2 Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store 
Fix potential races in the volume store
Upstream-commit: cc207aa136fd5e01164d245de94fb900ca7212a2
Component: engine
 2015-11-06 08:48:12 -08:00
Vivek Goyal eaec8fb727 devmapper: Provide more error information if blkid fails 
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 2c8b7c597ae43e28887a52a9fcb12273fe7d8797
Component: engine
 2015-11-06 08:21:20 -05:00
Doug Davis 26ede0774c Merge pull request #17753 from runcom/fix-typo-tests-reqs 
integration-cli: requirements: fix typo
Upstream-commit: 6ba7d04d1610472371b4c6a5a572119ffb10f6e9
Component: engine
 2015-11-06 07:02:51 -05:00
Antonio Murdaca 181fef49a3 Merge pull request #17746 from coolljt0725/remove_lxcconfig 
Remove LxcConf in daemon_test.go and fix a typo
Upstream-commit: 7dda44004d9943b669f12f3d79456806110d974b
Component: engine
 2015-11-06 12:21:33 +01:00
Antonio Murdaca b9c3e2329d integration-cli: requirements: fix typo 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 313b85fa47c0080feb0d5887903df9b74f0701bf
Component: engine
 2015-11-06 12:15:42 +01:00
Guilhem Lettron d04d1fe56b Fix missing -d flag in docker.fish 
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
Upstream-commit: 4a3cd881721ff7986fcdc3544e67b66a259c2ca6
Component: engine
 2015-11-06 11:53:17 +01:00
Brian Goff 920a8605ab Merge pull request #17383 from Microsoft/10662-volumeerrors 
Fix volume error messages
Upstream-commit: f1834153de196361e14c86b12c98d6b118cd4f56
Component: engine
 2015-11-05 21:58:03 -05:00
Lei Jitang e11568b0ea Remove LxcConf in daemon_test.go and fix a typo 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 00d00b429ff6f5cecf6789d6b6773b8e979ad0ae
Component: engine
 2015-11-06 09:58:06 +08:00
Sebastiaan van Stijn 2c2adafd8e Merge pull request #17696 from thaJeztah/update-ubuntu-install 
Docs: add "Linux kernel extra" to manual install
Upstream-commit: 5e2f31e99220536bc0d845bfbfedde59a007a276
Component: engine
 2015-11-06 02:04:05 +01:00
Sebastiaan van Stijn c6ff072fba Merge pull request #17610 from thaJeztah/add-env-example 
Add examples for ENV vars in API
Upstream-commit: 7a2669f59683c9d286494fa1360c792cc501e98f
Component: engine
 2015-11-06 01:19:58 +01:00
Sven Dowideit d46b75c80b Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link 
Fixed link to contribution page in docs/README.md.
Upstream-commit: a1ecd8e68cb373af2b02d75a222ac9ce07517665
Component: engine
 2015-11-06 09:57:07 +10:00
Solomon Hykes 13125ff6b4 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
 2015-11-05 15:22:37 -08:00
David Calavera b31d380f40 Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic 
Fix panic in parsing /etc/os-release
Upstream-commit: 98ec6bc14c165a06cf510ca5714ce4e831d405e6
Component: engine
 2015-11-05 15:11:02 -08:00
David Calavera 90a6db029c Merge pull request #17735 from LK4D4/errcode_resize 
Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine
 2015-11-05 15:00:48 -08:00
John Howard d0707f6b8c Windows: Fix docker login 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9c765040a5638429384b56a1b77139c6d4049c75
Component: engine
 2015-11-05 14:19:48 -08:00
David Calavera f427a47755 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
 2015-11-05 17:09:58 -05:00
David Calavera ef88e7ace2 Remove LXC support. 
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
 2015-11-05 17:09:57 -05:00
Tianon Gravi 0962f376e6 Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem 
Update upstart init script to start on filesystem (not only on local ones).
Upstream-commit: 6417c53c5ac4a066a0743c595e53c599a21c1e7e
Component: engine
 2015-11-05 13:51:07 -08:00
Jess Frazelle 4925d54787 Merge pull request #17496 from chasebolt/centos-rpm-dep 
setting device-mapper-libs version dependency for centos 7 rpm
Upstream-commit: 31fa27d47ead9d3be08338a748ee9cc21c085183
Component: engine
 2015-11-05 13:46:27 -08:00
Alexander Morozov b37ddbaf2b Move errcode handling for resize upper 
It'll allow to separate daemon layer more cleanly later.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bb0e7eb196c65972ea66154461b7e654d776f92a
Component: engine
 2015-11-05 13:42:33 -08:00
David Calavera ce27d8b852 Merge pull request #17726 from runcom/fix-errors-format 
Fix errors format
Upstream-commit: b52bedbd480b5029656733a449bd3596b8561e5a
Component: engine
 2015-11-05 13:30:57 -08:00
Brian Goff bbe8f4c04c Merge pull request #17678 from asbjornenge/tm_syntax_updates 
Added ARG instruction and aligned with src repo
Upstream-commit: 8de3d630add946e97d2a1e4895de1b7691b0b842
Component: engine
 2015-11-05 16:30:19 -05:00
David Calavera 44fac78e29 Merge pull request #17685 from WeiZhang555/cluster-parser 
Fix `--cluster-store` option parser
Upstream-commit: c7b65288e458f51ea2d5adcb8692c279726a8292
Component: engine
 2015-11-05 13:21:52 -08:00
Brian Goff 723ed1d8d2 Merge pull request #17534 from Microsoft/10662-filterhyperv 
Windows: Add isolation to ps filter
Upstream-commit: 9465d6ee6a669e4978ce746f16280910db7b1359
Component: engine
 2015-11-05 15:55:47 -05:00
Julien Pervillé 266b690d59 Update upstart init script to start on filesystem (not only on local ones). 
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com>
Upstream-commit: 6f83dd22a36b57fdc75bd2b6cbce7572b0695f99
Component: engine
 2015-11-05 20:38:52 +01:00
Jess Frazelle e5389225be Merge pull request #17677 from fboudra/master 
Remove yum cache to reduce image size
Upstream-commit: 3c6962f22d60e1afd43ebbf87ff5586f16131011
Component: engine
 2015-11-05 11:16:40 -08:00
Vincent Demeester 85d3458e13 Fix panic in parsing /etc/os-release 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7b102dc11486539bc661a4d858e2de3ce3f46493
Component: engine
 2015-11-05 19:59:29 +01:00
Vincent Demeester 97dac59e9f Vendor mattn/go-shellwords 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b09a452c1f89e84b513ed7eaf567437291e0e50d
Component: engine
 2015-11-05 19:59:28 +01:00
Jess Frazelle 7928e48119 Merge pull request #17273 from stefanberger/apparmor_policy_1.9 
More Rules for AppArmor
Upstream-commit: 5353ccb05c440f2961438f13d5812a844a501c28
Component: engine
 2015-11-05 10:52:43 -08:00
John Howard 2ba09b4e09 Windows: Add isolation to ps filter 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9c5814171ce7ab3af48867da36f4d374f804c4a6
Component: engine
 2015-11-05 10:18:24 -08:00
Antonio Murdaca 1bdb88a97a Fix errors format 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 77826333fe12fb444ac536e115f23f8e00db24a8
Component: engine
 2015-11-05 18:17:37 +01:00
Sebastiaan van Stijn 356e7220ae Merge pull request #17725 from polonskiy/patch-1 
fix typo
Upstream-commit: 336dea3e50144c5410ff693eb72bdc04ef40e914
Component: engine
 2015-11-05 17:40:45 +01:00
Anton Polonskiy d7b81a07c8 fix typo 
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
Upstream-commit: 3f331eaa4092ff3a612a275351b82b44c778d9fa
Component: engine
 2015-11-05 18:33:16 +02:00
Stefan Berger 60f7222f3f More Rules for AppArmor 
This patch addresses the following AppArmor complains:

type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount"
  info="failed srcname match" error=-13 profile="/usr/bin/docker"
  name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate"

type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED"
  operation="file_lock" profile="/usr/bin/docker"
  name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker"
  requested_mask="k" denied_mask="k" fsuid=0 ouid=0

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Upstream-commit: 02411987ffc696e867ac202e79c82ac97b3ae69a
Component: engine
 2015-11-05 11:06:18 -05:00
Vincent Demeester f5a3f3f5b7 Merge pull request #17722 from jeroenj/patch-1 
Fixes typo in docs/userguide/dockervolumes.md
Upstream-commit: c05e1b7d57c31e2490676370428544a06e2ba636
Component: engine
 2015-11-05 16:22:32 +01:00
Christopher Jones c502ed0cdf Updated link to https. 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f48f850a241fbfbf726b22756227f3fbb0db01a7
Component: engine
 2015-11-05 09:20:20 -06:00
Jeroen Jacobs dcbc728ac9 Fixes typo in docs/userguide/dockervolumes.md 
Signed-off-by: Jeroen Jacobs <git@jeroenj.be>
Upstream-commit: 75602d4930e7b7fa7c958329b544401756991d88
Component: engine
 2015-11-05 16:08:11 +01:00
Antonio Murdaca 50aae3f0be Merge pull request #17207 from azurezk/assert_docker_cli_help_test 
update docker_cli_help_test.go
Upstream-commit: 22ef779db97362bbb8122933e32d87d92c7a0489
Component: engine
 2015-11-05 15:15:52 +01:00
Brian Goff 5299efe664 Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create 
Optimize Create Container to skip extra mount on Windows.
Upstream-commit: bb9eca90363eec052e101bb8ef3351d0218dccf9
Component: engine
 2015-11-05 09:15:28 -05:00
Antonio Murdaca 281fcbcfb6 Merge pull request #17574 from Microsoft/10662-devicetool 
Windows: Fix docker device tool
Upstream-commit: 71db33738d681ab7855998e414d426fcc26f16ea
Component: engine
 2015-11-05 13:05:28 +01:00
Vincent Demeester 0e4d37bec5 Merge pull request #17697 from jfrazelle/test-old-apt-repo 
add script to test the old apt-repo
Upstream-commit: f267e4be54170855693d240e605ff9a4ee8e891d
Component: engine
 2015-11-05 12:11:57 +01:00