toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,163 Commits 3 Branches 295 Tags
e5276fe0a7c1ec0087814d452c1d6323742ab997
Commit Graph
14163 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mary Anthony e5276fe0a7 Removing sudo from command line examples 
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
 2015-03-26 11:12:37 -07:00
Mary Anthony d294d535e9 Removing sudo from examples 
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
 2015-03-26 10:13:19 -07:00
Alexander Morozov 137e45c97e Merge pull request #11786 from peggyl/golint-api-client 
Fix golint errors for casing in api/client package
Upstream-commit: b9d19fdaef68681186411a8ab2024211dda409d6
Component: engine
 2015-03-26 09:28:33 -07:00
Alexander Morozov db74987998 Merge pull request #11789 from parknicker/PostContainerWaitFix 
Changes response of postContainersWait to use a struct
Upstream-commit: d4fca8047cc4b4b3bf21900c34169ee99cb17ad8
Component: engine
 2015-03-26 08:40:00 -07:00
Alexander Morozov d90880d842 Merge pull request #11702 from jimmypuckett/feature/bitflag_checking_style_11668 
Feature/bitflag checking style 11668.  Fixes #11668
Upstream-commit: dd492dc15d462aee110e4d6df6297ad64c5fad56
Component: engine
 2015-03-26 08:34:58 -07:00
Doug Davis d43cf4b5b0 Merge pull request #11806 from aneshas/11770-redundant-err-nil-check 
Removed redundant err == nil check
Upstream-commit: afc8ae939aabf0e9e348ae62624a1740c8607508
Component: engine
 2015-03-26 10:07:40 -04:00
Anes Hasicic b5975ff15e Removed redundant err == nil check 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
Upstream-commit: b38e11b3c4a84e35bfd76bff8133a5338cd69423
Component: engine
 2015-03-26 11:36:13 +01:00
Alexander Morozov b9013b315f Merge pull request #11794 from moo-mou/11790-pkgulimit 
Fixes pointer error
Upstream-commit: bc0f1e0e098d49fff458679001fe4e2ae58c03d7
Component: engine
 2015-03-25 21:30:37 -07:00
Nick Parker 7938582b08 fixes comment for ContainerWaitResponse struct 
Signed-off-by: Nick Parker <nikaios@gmail.com>
Upstream-commit: 89d63d2a82e9a4c20696e9e93736a99a10be6c91
Component: engine
 2015-03-25 22:22:58 -06:00
Arnaud Porterie 7830df3aef Merge pull request #11795 from grubernaut/net_none_test_fixes 
Add fixes for integration-cli tests w/ --net none
Upstream-commit: 191f88dd2cc30b03daaf79366dd9d6fbdcd3049e
Component: engine
 2015-03-25 21:22:28 -07:00
Steve Francia e32695a057 Merge pull request #11781 from xamyzhao/patch-1 
Updated step 5 with Windows instructions so that installation works in W...
Upstream-commit: ff2fc9757de5661188d09bef9804c904d8910092
Component: engine
 2015-03-25 23:51:35 -04:00
Phil Estes 0dfca0423d Merge pull request #11468 from robertabbott/10959-refactor-progressreader-hack 
Fixes hacks from progressreader refactor
Upstream-commit: 23699f5a29ebc166fbf05e0b093725b2bda31ed7
Component: engine
 2015-03-25 23:50:43 -04:00
Jake Champlin 35acd2c3eb Add fixes for integration-cli tests w/ --net none 
Adds network to integration tests that were failing without network.

Fixes #10964
Fixes #10968

Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>
Upstream-commit: c2fe26243906ad2641876e877d23a419bb4bdb75
Component: engine
 2015-03-25 23:46:04 -04:00
paul e193f3caea Fixes pointer error 
Signed-off-by: Paul Mou <ppymou@gmail.com>
Upstream-commit: 273fdd97edec3ad758dbf94e8268fd57512cee02
Component: engine
 2015-03-25 20:45:17 -07:00
Nick Parker bfdce6caee Changes response of postContainersWait to use a struct 
Signed-off-by: Nick Parker <nikaios@gmail.com>
Upstream-commit: 1bc266dfa714f097cc9babf2f0c771566388d47b
Component: engine
 2015-03-25 21:01:14 -06:00
Peggy Li 738874a52d Fix golint errors for casing in api/client package 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
Upstream-commit: a465e26bb05083c247ba74e1092338c43c76be47
Component: engine
 2015-03-25 19:54:29 -07:00
bobby abbott 0ee1e9f604 Fixes hacks from progressreader refactor 
related to #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 0cd6c05d8112e9246b734107d54e2855e3d5fec5
Component: engine
 2015-03-25 18:21:02 -07:00
moxiegirl 0ee9f8042e Merge pull request #11776 from shin-/security_opt_docs_fix 
API docs fix for SecurityOpt parameter.
Upstream-commit: f84086be2a570f02cbde3a4bd018d535def964d4
Component: engine
 2015-03-25 18:20:59 -07:00
Jessie Frazelle 6ebf43180d Merge pull request #11779 from blatyo/add_ulimit_test 
Add test for successful Ulimit Parse.
Upstream-commit: 667452ec63b2965ae6291b87f8d10f0a9913a922
Component: engine
 2015-03-25 17:34:58 -07:00
Alexander Morozov b267f3bec0 Merge pull request #11778 from blatyo/fix_ulimit_string 
Fix (*Ulimit).String() function. Closes #11769.
Upstream-commit: d0b2cfa1f1d95c1d25716dd18a9f3899a72d58c3
Component: engine
 2015-03-25 17:33:00 -07:00
xamyzhao 5ce782f869 Updated step 5 with Windows instructions so that installation works in Windows 
Signed-off-by: Amy Zhao <x.amy.zhao@gmail.com>
Signed-off-by: Amy Zhao <xamyzhao@mit.edu>
Upstream-commit: ba222f7bc89f7d7f3c83b54cb0a3567ca3694f34
Component: engine
 2015-03-25 20:32:50 -04:00
Allen Madsen 5926e0ab7b Add test for successful Ulimit Parse. 
Signed-off-by: Allen Madsen <blatyo@gmail.com>
Upstream-commit: a97ca674f06cc7e70cc6defd617afa7775a8480a
Component: engine
 2015-03-25 20:03:26 -04:00
Allen Madsen 940c2dcc3c Fix (*Ulimit).String() function. Closes #11769. 
Signed-off-by: Allen Madsen <blatyo@gmail.com>
Upstream-commit: cb168e5622fefc42df1fa0e355aa5922c74329e8
Component: engine
 2015-03-25 19:39:05 -04:00
Joffrey F fa879dbf22 SecurityOpt parameter is singular, and belongs in HostConfig 
since API 1.17

Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 61dba98608446f10b516a677753877cc3160173f
Component: engine
 2015-03-25 16:25:13 -07:00
Arnaud Porterie ea26fe641c Merge pull request #11757 from ankushagarwal/Fds 
Rename 'Fds' to 'File Descriptors' in docker info
Upstream-commit: e589dc7424dfad993f1fc646b66fa04306a2df2d
Component: engine
 2015-03-25 16:24:57 -07:00
Jimmy Puckett f2b849a215 running code formatter as @tiborvass requested 
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com>
Upstream-commit: 5dde99163e7674814f2d9be0bc22c9618fa70b89
Component: engine
 2015-03-25 19:24:55 -04:00
Jessie Frazelle 9d3f3b6126 Merge pull request #11772 from aneshas/11718-redundant-else 
Fixed redundant else
Upstream-commit: 89e7f5e6611e6237482d986777a3451034f7e4c0
Component: engine
 2015-03-25 16:16:16 -07:00
Jessie Frazelle ac25dc4e2f Merge pull request #11773 from icecrime/unused_securityopt_field 
Remove unused runconfig.Config.SecurityOpt field
Upstream-commit: f14bf9b53c2fd6b797f830a1d5fd49752963d86e
Component: engine
 2015-03-25 16:15:41 -07:00
Jessie Frazelle 6448734eca Merge pull request #11771 from aneshas/11719-redundant-elses 
Removed redundant elses
Upstream-commit: 8cd3564ec1e4450d2f991f61f74ba2dc488ffe0d
Component: engine
 2015-03-25 16:06:30 -07:00
Tibor Vass 6340350f2f Merge pull request #11745 from imdreamrunner/patch-1 
Add missing newline for bash code example
Upstream-commit: 8d62e12f4dfdbe795cae1a4bf4571aae3ea6b6ea
Component: engine
 2015-03-25 16:58:55 -06:00
Tibor Vass 481e04f931 Merge pull request #11774 from thaJeztah/fix-workdir-typo 
Fix typo "WRKDIR" -> "WORKDIR"
Upstream-commit: 136f8fa2ff07c64a5e6fc85476c172994d1be587
Component: engine
 2015-03-25 16:55:57 -06:00
Tibor Vass d7a68d4395 Merge pull request #11748 from minimum2scp/fix/debootstrap 
removed unnecessary tabs from /usr/sbin/policy-rc.d, and /sbin/initctl for mkimage.sh debootstrap
Upstream-commit: 87e877e3c17b3f8b591f7136c3bf6bf90ec18532
Component: engine
 2015-03-25 16:55:13 -06:00
Sebastiaan van Stijn c24a1cf195 Fix typo "WRKDIR" -> "WORKDIR" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6fdb583f3899362db13292ad3cad31fec970d638
Component: engine
 2015-03-25 23:47:38 +01:00
Arnaud Porterie 5e9f154fc1 Remove unused runconfig.Config.SecurityOpt field 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: e39646d2e1becb652ff0a8a7d131067f38a94247
Component: engine
 2015-03-25 15:46:42 -07:00
Anes Hasicic d222ef85ca Fixed redundant else 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
Upstream-commit: 3d7b9e8f30a48bc2e929d8ac3d82f70778e99b59
Component: engine
 2015-03-25 23:44:32 +01:00
Alexander Morozov a4f43804e5 Merge pull request #11761 from runcom/11731-remove-engine-status 
Remove engine.Status, replace with standard go error
Upstream-commit: e6cbffe94b9faf282332a4db3e07c97da4d31a83
Component: engine
 2015-03-25 15:41:02 -07:00
Anes Hasicic 6200bccb4a Removed redundant elses 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
Upstream-commit: 1b6065de8f46edc8f36f6b3734fe64175e413dc3
Component: engine
 2015-03-25 23:34:00 +01:00
Antonio Murdaca a16f3d6cb4 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c79b9bab541673af121d829ebc3b29ff1b01efa2
Component: engine
 2015-03-25 22:32:08 +01:00
Michael Crosby a2c5155c6a Merge pull request #11758 from crosbymichael/update-libct-mar25 
Update libcontainer to a6044b701c166fe538fc760f9e2
Upstream-commit: 3d9cbf0e7176e8aa5d4078cd00a400e1dcc5169d
Component: engine
 2015-03-25 12:17:33 -07:00
Ankush Agarwal 12d1265301 Rename Fds to File Descriptors in docker info 
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 161c2e5e74e06b863b91d0f325faf083530ae1b8
Component: engine
 2015-03-25 12:04:15 -07:00
Arnaud Porterie a9e8a0831a Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs 
Removes bind dir creation in daemon start.
Upstream-commit: 54a607a22d625a06fabf604053748f708afc4d94
Component: engine
 2015-03-25 11:44:13 -07:00
Jessie Frazelle aa398ec2d6 Merge pull request #11756 from vbatts/vbatts-remove_trailing_whitespaces 
.: remove trailing white spaces
Upstream-commit: 667df336b7003fe4993eb1fd051efb6550c5e425
Component: engine
 2015-03-25 11:36:10 -07:00
Michael Crosby 645e076e86 Update libcontainer to a6044b701c166fe538fc760f9e2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b4196f7892f4aeb11318bbd6c2d68227868e27e2
Component: engine
 2015-03-25 11:32:14 -07:00
Jessie Frazelle da613cd280 Merge pull request #11753 from vbatts/vbatts-btrfs_ifdef_build_version 
btrfs: #ifdef for build version
Upstream-commit: e6e2893fa3557684b70e0d79ba2699f499c964ea
Component: engine
 2015-03-25 11:25:49 -07:00
YAMADA Tsuyoshi 83e6c527aa removed unnecessary tab from /usr/sbin/policy-rc.d, and /sbin/initctl 
Signed-off-by: YAMADA Tsuyoshi <tyamada@minimum2scp.org>
Upstream-commit: 09165e0fe0b2b1b0dd2c9be45a7ca7f53c2fae29
Component: engine
 2015-03-26 03:10:34 +09:00
Vincent Batts b18a43073b btrfs: #ifdef for build version 
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: b76e300b4cd6ce4446170c7170a2734f7994a6c1
Component: engine
 2015-03-25 13:56:51 -04:00
Vincent Batts d4497c7a2b .: remove trailing white spaces 
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
 2015-03-25 13:38:17 -04:00
Xinzi Zhou f7a30f1c84 Add missing newline for bash code example 
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com>
Upstream-commit: ed7907a988fe336711603e38c8b79d673e87c902
Component: engine
 2015-03-26 01:24:00 +08:00
Doug Davis 24a2c3a692 Merge pull request #11751 from tiborvass/revert-validate-spaces 
Revert "Dealing with trailing whitespaces"
Upstream-commit: a0cfe83435e5f62fc8de4f18b5120332bbfa37c2
Component: engine
 2015-03-25 13:01:58 -04:00
Alexander Morozov 5d59835e1f Merge pull request #11750 from MabinGo/adjust_log_func_call 
Use appropriate func to record logs according to different scene
Upstream-commit: 444c967aece4ef021aefe209a067c5d94ceb817e
Component: engine
 2015-03-25 09:41:41 -07:00