docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle
12149e8293 Merge pull request #13754 from cpuguy83/13753_fix_events_64 
Default events since to current time
 2015-06-10 10:34:13 -07:00
Jeffrey Morgan
c5d8f57b13 Fixes a bug where expired token would not be refreshed 2015-06-10 10:30:39 -07:00
Jeff Nickoloff
bf305c1b91 Adding a volume for the default 'registry-dev' location. 
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
 2015-06-10 10:25:41 -07:00
Jeffrey Morgan
f65a3da05b Merge pull request #600 from kraynel/windows 
Change Windows paths and exec methods to allow mounting, ssh and terminal.
 2015-06-10 10:21:28 -07:00
Aanand Prasad
17e03b29f9 Merge pull request #1533 from edmorley/update-b2d-shellinit-example 
Docs: Update boot2docker shellinit example to use 'eval'
 2015-06-10 13:03:55 -04:00
Brian Goff
74c12aa429 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 12:37:40 -04:00
Brian Goff
88e4dff9a9 use go-generate to build volume/driver/proxy.go 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 11:42:15 -04:00
James Turnbull
5821f13b8c Merge pull request #13844 from ponsfrilus/master 
Typo psuedo - pseudo
 2015-06-10 11:41:44 -04:00
Brian Goff
4c81c9dddc generate plugin clients via template 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 11:41:40 -04:00
Doug Davis
46af724e81 Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
 2015-06-10 08:32:57 -07:00
Tibor Vass
de90aef411 Merge pull request #12813 from Microsoft/10662-nolinuxgraph 
Windows: Don't build Linux graph drivers
 2015-06-10 10:01:50 -04:00
Antonio Mercado
b450b42c25 Removing Nginx Authorization header unset because it breaks with a user defined index endpoint 
Signed-off-by: Antonio Mercado <amercado@thinknode.com>
 2015-06-10 09:44:43 -04:00
Ed Morley
e3ba302627 Docs: Update boot2docker shellinit example to use 'eval' 
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786.

Signed-off-by: Ed Morley <emorley@mozilla.com>
 2015-06-10 14:38:35 +01:00
kraynel
f945e4ab45 Merge remote-tracking branch 'upstream/windows' into windows 
Signed-off-by: kraynel <kraynel@yahoo.fr>

Conflicts:
	src/components/ContainerHomeFolders.react.js
 2015-06-10 14:38:10 +02:00
Shijiang Wei
e2c6a8be7c Add the parent directory to changes set if new files are generated 
The "TestChangesWithChanges" case randomlly fails on my development
VM with the following errors:
```
--- FAIL: TestChangesWithChanges (0.00s)
        changes_test.go:201: no change for expected change C /dir1/subfolder != A /dir1/subfolder/newFile
```

If I apply the following patch to changes_test.go, the test passes.

```diff
diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
index 290b2dd..ba1aca0 100644
--- a/pkg/archive/changes_test.go
+++ b/pkg/archive/changes_test.go
@@ -156,6 +156,7 @@ func TestChangesWithChanges(t *testing.T) {
        }
        defer os.RemoveAll(layer)
        createSampleDir(t, layer)
+       time.Sleep(5 * time.Millisecond)
        os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)

        // Let's modify modtime for dir1 to be sure it's the same for the two layer (to not having false positive)
```

It seems that if a file is created immediately after the directory is created,
the `archive.Changes` function could't recognize that the parent directory of
the new file is modified.

Perhaps the problem may reproduce on machines with low time precision?
I had successfully reproduced the failure on my development VM as well as
a VM on DigitalOcean.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-06-10 20:29:29 +08:00
Nicolas Borboën
e12839fa5a Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
 2015-06-10 13:27:55 +02:00
Peeyush Gupta
fc9c5d70e7 Fixing errors in stress test 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-06-10 14:39:31 +05:30
Lorenzo Affetti
b7a8de4661 cannot comment on one line command 
Signed-off-by: Lorenzo Affetti <affox90@gmail.com>
 2015-06-10 09:38:17 +02:00
Jeffrey Morgan
a232108dd3 Merge branch 'master' into windows 2015-06-09 23:18:12 -07:00
Jeffrey Morgan
5048d16e22 OS X zip 2015-06-09 23:17:49 -07:00
Jeffrey Morgan
c53400fb90 Fix signing 2015-06-09 22:27:27 -07:00
Jeffrey Morgan
1263a8c4fe Fix icon on mac os x 2015-06-09 21:54:11 -07:00
Jeffrey Morgan
1552d09957 Accounting for settings.json 2015-06-09 20:49:26 -07:00
Jeffrey Morgan
47beaee0c8 Removing unnecessary console log in Gruntfile 2015-06-09 20:44:25 -07:00
Jeffrey Morgan
8f465c1a8c Separate Mac OS X and Windows tasks 2015-06-09 20:35:46 -07:00
Jeffrey Morgan
7c67548fc6 Fix bug where SIGTERMing grunt would not stop Electron 2015-06-09 20:26:05 -07:00
Arnaud Porterie
55bdb51659 Merge pull request #13699 from calavera/volume_backwards 
Allow to downgrade local volumes from > 1.7 to 1.6.
 2015-06-09 19:51:06 -07:00
Daniel Nephin
87c30ae6e4 Merge pull request #1531 from aanand/test-crash-resilience 
Test that data volumes now survive a crash when recreating
 2015-06-09 22:22:56 -04:00
Victor Vieux
db580ab040 Merge pull request #925 from vieux/pretty_print_offers 
pretty print mesos offers
 2015-06-09 18:14:15 -07:00
David Calavera
bd9814f0db Allow to downgrade local volumes from > 1.7 to 1.6. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-09 18:04:59 -07:00
Jeffrey Morgan
05e32dc3e5 Bump machine version to 0.3.0 rc2 2015-06-09 17:57:17 -07:00
Jeffrey Morgan
5f8776c0ee Adding mac os x 2015-06-09 17:56:08 -07:00
Victor Vieux
c44151ff4a pretty print mesos offers 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 17:30:14 -07:00
Michael Crosby
4750e1f77e Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
 2015-06-09 17:24:30 -07:00
Jeffrey Morgan
140ae4671b Installer & dist for windows 2015-06-09 17:16:00 -07:00
Arnaud Porterie
c3b962d327 Merge pull request #13831 from LK4D4/update_libcontainer 
Update libcontainer to v2.1.1
 2015-06-09 17:12:20 -07:00
Arnaud Porterie
13baeb3b70 Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302 
Do not set auth headers for registry v1 if 302
 2015-06-09 15:34:53 -07:00
Daniel Nephin
8212f1bd45 Merge pull request #1529 from aanand/update-dockerpty 
Update dockerpty to 0.3.4
(cherry picked from commit 95b2eaac04)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 18:24:14 -04:00
Daniel Nephin
95b2eaac04 Merge pull request #1529 from aanand/update-dockerpty 
Update dockerpty to 0.3.4
 2015-06-09 18:21:14 -04:00
David Lawrence
953d79888a fixing build errors 2015-06-09 15:04:09 -07:00
Olivier Gambier
b230183b0f Merge pull request #553 from dmp42/docs-rework 
Docs rework
 2015-06-09 14:48:39 -07:00
Jessie Frazelle
ceee2595b6 Merge pull request #12583 from Mic92/hack/explicit-bundles 
Hack/explicit bundles
 2015-06-09 14:34:52 -07:00
mapk0y
416e855e9b fix typo. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2015-06-10 06:26:07 +09:00
Victor Vieux
722b0e962d Merge pull request #923 from vieux/improve_locks_mesos 
Improve locks mesos
 2015-06-09 13:58:06 -07:00
Alexander Morozov
38acd31e8a Update libcontainer to v2.1.1 
It includes fix for mounting / as volume on SELinux.
docker/libcontainer#619

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-06-09 13:54:57 -07:00
Alexander Morozov
5e86b818ed Merge pull request #13828 from calavera/plugin_fixes 
Fix volume plugin serialization.
 2015-06-09 13:30:55 -07:00
Victor Vieux
12dac7560a fix lock in cluster.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 12:18:38 -07:00
Victor Vieux
3a1df50ed5 improve locks in queue.go 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-09 11:43:21 -07:00
Daniel Nephin
dca3bbdea3 Merge pull request #1527 from aanand/remove-logging-on-run-rm 
Remove logging on run --rm
(cherry picked from commit 5578ccbb01)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:53 -04:00
Daniel Nephin
8ed7dfef6f Merge pull request #1525 from aanand/fix-duplicate-logging 
Fix duplicate logging on up/run
(cherry picked from commit e2b790f732)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:52 -04:00