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
Aanand Prasad
8f8693e13e Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop 
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Ben Firshman
363a6563c7 Merge pull request #1537 from aanand/reorder-service-utils 
Reorder service.py utility methods
(cherry picked from commit e3525d64b5)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
59d6af73fa Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
(cherry picked from commit 4c2112dbfd)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
cd7f67018e Merge pull request #1466 from noironetworks/changing-scale-to-warning 
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Ben Firshman
b7e8770c4f Merge pull request #1538 from thieman/tnt-serivce-misspelled 
Correct misspelling of "Service" in an error message
(cherry picked from commit bd246fb011)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
ad4cc5d6df Merge pull request #1497 from aanand/use-1.7-rc1 
Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07:00
Aanand Prasad
ca14ed68f7 Merge pull request #1533 from edmorley/update-b2d-shellinit-example 
Docs: Update boot2docker shellinit example to use 'eval'
(cherry picked from commit 17e03b29f9)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07:00
Daniel Nephin
71514cb380 Merge pull request #1531 from aanand/test-crash-resilience 
Test that data volumes now survive a crash when recreating
(cherry picked from commit 87c30ae6e4)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07:00
Derek McGowan
a98ea87e46 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)
 2015-06-15 11:08:21 -07:00
Vivek Goyal
407a626be6 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>
 2015-06-15 14:05:10 -04:00
Aanand Prasad
5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
 2015-06-15 10:58:44 -07:00
Aanand Prasad
acd8dce595 Add upgrading instructions to install docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:46:48 -07:00
Daniel Nephin
b3b44b8e4c Merge pull request #1550 from aanand/update-docker-py 
Update setup.py with new docker-py minimum
 2015-06-15 13:43:57 -04:00
Aanand Prasad
aaccd12d3d Merge pull request #1545 from moxiegirl/test-tooling 
Updated for new documentation tooling
 2015-06-15 10:36:37 -07:00
David Calavera
d8592eaff8 Revert "contrib/init: unshare mount namespace for inits" 
This reverts commit b6569b6b82.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-15 10:35:17 -07:00
Aanand Prasad
b4c49ed805 Use Docker 1.7 RC3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:25:58 -07:00
Aanand Prasad
4e108e377e Update setup.py with new docker-py minimum 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:18:15 -07:00
Alexander Morozov
1157fcc4a4 Merge pull request #13926 from Microsoft/10662-createfixup 
Windows: Fixup compile in daemon_windows.go
 2015-06-15 10:17:24 -07:00
Aanand Prasad
5231288b4e Merge pull request #1489 from dnephin/faster_integration_tests 
Faster integration tests
 2015-06-15 10:04:45 -07:00
TeckniX
af0be797d1 Fixed scrollbottom 
Signed-off-by: TeckniX <lokitek@gmail.com>
 2015-06-15 12:43:07 -04:00
Jeffrey Morgan
407fd508d9 Merge branch 'windows' of github.com:kitematic/kitematic into windows 
Conflicts:
	package.json
	src/components/ContainerSettingsVolumes.react.js
	src/stores/SetupStore.js
 2015-06-15 09:15:57 -07:00
Jeffrey Morgan
b8bbc85399 Initial windows header 2015-06-15 09:14:19 -07:00
Jeffrey Morgan
575642a427 Update README.md 2015-06-15 09:01:20 -07:00
Sebastiaan van Stijn
637023a5f8 Merge pull request #13502 from coolljt0725/conflict_port_and_netmode 
Add --net=container with --publish --expose --publish-all error out
 2015-06-15 16:25:59 +02:00
unclejack
6578ad90c3 docker/daemon: set umask to the default on startup 
This sets up the umask so that it's the same on all systems.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-06-15 16:47:20 +03:00
Jeffrey Morgan
fddf09ff3c Merge pull request #634 from moxiegirl/test-tooling 
Updating for hugo
 2015-06-14 17:38:15 -07:00
Mary Anthony
7858d301ff Updating for Hugo work 
Updating title and other things
Removing old mkdocs file
Updating with the new sed scripts
Moving from index.md swarm-overview.md
Updating with the correct image

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:07:37 -07:00
Mary Anthony
ed45ddb82f Tooling for release build 
Tweaking for tooling
Adding in the sed for markdown in Dockerfile
Should be machine not engine
Updating with correct image

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:05:57 -07:00
Mary Anthony
bf7821b493 Updating for hugo 
Adding sed for GitHub Markdown
Moving from index.md to kitmatic-overview
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:03:33 -07:00
Mary Anthony
54b3642abb Updating for hugo 
Updating the sed tasks
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:02:08 -07:00
Mary Anthony
e40fc02561 Testing with documentation tooling 
Updating with changes
Updating for Hugo
Adding a README'
moving index.md compose-overview.md in links
changing overview
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:00:08 -07:00
Asbjørn Enge
dfec4a48c7 Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2015-06-15 00:04:05 +02:00
Asbjørn Enge
ac8cbf4952 Updated TextMate install instruction - this bundle is not included in TM 😄 :rocket 
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
 2015-06-15 00:02:10 +02:00
Daniel Nephin
06db577105 Move converge() to a test module, and use a short timeout for tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 17:18:27 -04:00
Travis Thieman
c24d5380e6 Extend up -t to pass timeout to stop running containers 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin
60351a8e07 Speed up integration test and make cleanup easier by using labels 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin
d827809ffb Use labels to filter containers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Robin Schneider
0030df868a Do not compress rootfs archive in mkimage.sh. 
* This wastes CPU time for compressing and decompressing.

Signed-off-by: Robin Schneider <ypid@riseup.net>
 2015-06-14 20:51:11 +02:00
Daniel Nephin
77e594dc94 Merge pull request #1544 from aanand/fix-volume-deduping 
Fix volume binds de-duplication
 2015-06-14 13:28:14 -04:00
Jeffrey Morgan
fffbc92915 Merge branch 'windows' of github.com:kitematic/kitematic into windows 2015-06-13 17:16:10 -07:00
Jeffrey Morgan
ba2b3a8fc2 Merge pull request #631 from kitematic/graceful-errors 
More graceful error for pulling and creating containers.
 2015-06-13 17:09:23 -07:00
Sean Li
c78e2cd0e6 Merge branch 'more-graceful-error-screen' into graceful-errors 2015-06-13 17:04:54 -07:00
Sean Li
b8592d448b More graceful error screen. 2015-06-13 17:04:04 -07:00
Jeffrey Morgan
5bc0b45874 Fixing errors with gruntfile 2015-06-13 17:01:49 -07:00
Jeffrey Morgan
d3911ee5a3 Kitematic development version of windows 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-06-13 16:58:48 -07:00
moxiegirl
ee40f29712 Merge pull request #13927 from moxiegirl/carry-13250 
Carry of PR #13520
 2015-06-13 10:29:56 -07:00
Tibor Vass
f27c9bc6e7 Merge pull request #13895 from calavera/fix_get_env_split 
Correct getEnv split.
 2015-06-13 12:43:45 -04:00
Mary Anthony
cd44018856 Carry of PR #13520 
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-13 09:27:30 -07:00
Arnaud Porterie
cd36b15ccb Merge pull request #13860 from jlhawn/cli_call_headers 
api/client: have cli.call() return headers
 2015-06-13 09:14:40 -07:00
John Howard
c7975f12d6 Windows: Fixup compile in daemon_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-13 09:10:54 -07:00