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

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeffrey Morgan
888e4f7f3b Merge pull request #70 from pdehaan/patch-1 
Updating package.json
 2014-10-19 19:40:52 -07:00
Jeffrey Morgan
3ba0c09018 Merge pull request #95 from denji/master 
Update README.md
 2014-10-19 19:40:13 -07:00
Jeffrey Morgan
ba1eec68d8 Merge pull request #95 from denji/master 
Update README.md
 2014-10-19 19:40:13 -07:00
Sean Li
319f7d85df Merge pull request #101 from kitematic/merge0.3.0 
Merge 0.3.0 RC into master.
 2014-10-19 19:39:39 -07:00
Sean Li
d88a3cb028 Merge pull request #101 from kitematic/merge0.3.0 
Merge 0.3.0 RC into master.
 2014-10-19 19:39:39 -07:00
Jeff Morgan
d06261e28f Moved additional eth2 network to instead replace eth1, bumped Boot2Docker dependency to 1.3 2014-10-19 19:37:37 -07:00
Jeff Morgan
c5b54f7dbb Moved additional eth2 network to instead replace eth1, bumped Boot2Docker dependency to 1.3 2014-10-19 19:37:37 -07:00
Jeff Morgan
660016f9fc Merge branch 'rc0.3.0' of github.com:kitematic/kitematic into merge0.3.0 
Conflicts:
	meteor/client/lib/boot2docker.js
 2014-10-19 16:29:36 -07:00
Jeff Morgan
d949b86198 Merge branch 'rc0.3.0' of github.com:kitematic/kitematic into merge0.3.0 
Conflicts:
	meteor/client/lib/boot2docker.js
 2014-10-19 16:29:36 -07:00
Jeff Morgan
c10ecc54db Fixing any breaks from Docker 1.3 2014-10-19 16:28:53 -07:00
Jeff Morgan
fe2641d9c8 Fixing any breaks from Docker 1.3 2014-10-19 16:28:53 -07:00
Sean Li
b9121f15ae Fixing up deprecation warning. 2014-10-19 15:34:33 -07:00
Sean Li
ca3ac6fd1c Fixing up deprecation warning. 2014-10-19 15:34:33 -07:00
Madhu Venugopal
18141652ba Fixed a minor docs issue in a Dockerfile Example 
The Dockerfile Instruction to create the .vnc directory results in a failure :
-storepasswd failed for file: /root/.vnc/passwd

Signed-off-by: Madhu Venugopal <madhu@socketplane.io>
 2014-10-19 10:16:30 -07:00
Phil Estes
d2cd8e77a6 Clean up comment sections and fix typos in CmdRun 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-19 02:47:53 -04:00
Phil Estes
65edb07065 Return container exit code with start -a/-i 
Addresses #8555

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-10-18 23:00:20 -04:00
Daniel Nephin
7544580b4b Resolves #553, Resolves #546 - bug fixes with unit tests 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-18 13:54:10 -04:00
Marc Tamsky
91502ba66b Add mention of e2fsprogs to runtime dependencies. 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
 2014-10-17 16:58:07 -07:00
Jessica Frazelle
b7249317c1 check ID in os-release instead 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-17 16:51:36 -07:00
Amit Bakshi
dbe24a048b install.sh: Fix for Amazon's Linux AMI 
Use /etc/os-release to determine distro

Contents of /etc/os-release on Amazon Linux AMI 2014.09:
NAME="Amazon Linux AMI"
VERSION="2014.09"
ID="amzn"
ID_LIKE="rhel fedora"
VERSION_ID="2014.09"
PRETTY_NAME="Amazon Linux AMI 2014.09"
ANSI_COLOR="0;33"
CPE_NAME="cpe:/o:amazon:linux:2014.09:ga"
HOME_URL="http://aws.amazon.com/amazon-linux-ami/"

Signed-off-by: Amit Bakshi <ambakshi@gmail.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-10-17 16:19:28 -07:00
Jessie Frazelle
005029cbdd Merge pull request #8483 from duglin/TabTest 
Add a testcase to make sure we don't squash tabs or convert them to spaces
 2014-10-17 16:03:22 -07:00
Doug Davis
c980fe09b7 Add a testcase to make sure we don't squash tabs or convert them to spaces 
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one

Closes #2315

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-10-17 15:52:48 -07:00
Alexandr Morozov
75fd1b614d Merge pull request #8639 from erikh/fix_escapes 
builder: fix escaping for ENV variables.
 2014-10-17 15:50:37 -07:00
Erik Hollensbe
df0e0c7683 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-17 21:47:35 +00:00
Sean Li
b136966036 Updated Meteor. 2014-10-17 13:33:12 -07:00
Sean Li
870fad25d4 Updated Meteor. 2014-10-17 13:33:12 -07:00
Jessie Frazelle
3c325f89e5 Merge pull request #8415 from LK4D4/use_logs_in_builder 
Use logs instead of attach for builder
 2014-10-17 13:32:13 -07:00
Alexandr Morozov
2db1caee4f Make daemon.Attach private 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 13:20:02 -07:00
Alexandr Morozov
6f09d064bd Use logs instead of attach for builder 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 13:20:02 -07:00
Jessie Frazelle
b357f76e5d Merge pull request #8565 from LK4D4/remove_fixtures_copy_tests 
Remove fixtures copy tests
 2014-10-17 13:10:30 -07:00
Tianon Gravi
fb5e6526d8 Merge pull request #8561 from albers/bash-completion 
Fix support for --env-file in bash completion
 2014-10-17 13:26:24 -06:00
Alexandr Morozov
93d3c8e71d Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:58:12 -07:00
Alexandr Morozov
98e7608b4c Rewrite TestBuildCopyDisallowRemote to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:58:12 -07:00
Alexandr Morozov
c8a5d56fd7 Rewrite TestBuildCopyEtcToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:57:48 -07:00
Alexandr Morozov
6582ea574c Rewrite TestBuildCopyWholeDirToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:57:30 -07:00
Alexandr Morozov
4a029259ff Rewrite TestBuildCopyDirContentToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:57:07 -07:00
Alexandr Morozov
832618afc6 Rewrite TestBuildCopyDirContentToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:56:49 -07:00
Alexandr Morozov
24d83afd52 Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:56:28 -07:00
Alexandr Morozov
2248109ff8 Rewrite TestBuildCopySingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:56:01 -07:00
Alexandr Morozov
d41cba6aed Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:55:34 -07:00
Alexandr Morozov
83c5dced10 Rewrite TestBuildCopySingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:55:04 -07:00
Alexandr Morozov
e45c92153d Rewrite TestBuildCopyAddMultipleFiles to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:54:29 -07:00
James Turnbull
04932e38af Merge pull request #8614 from ryanrdetzel/master 
exec docs syntax fix
 2014-10-17 14:38:43 -04:00
Jessie Frazelle
5a20dc67b0 Merge pull request #8567 from LK4D4/add_log_done 
Add logDone for TestBuildAddSingleFileToNonExistDir
 2014-10-17 11:20:12 -07:00
Jessie Frazelle
09ceae5c9c Merge pull request #8486 from duglin/Issue5701 
Add failing testcase for single quotes in CMD
 2014-10-17 11:11:49 -07:00
Alexandr Morozov
ad136e1ae3 Don't write pull output to stdout on container creating 
Fixes #8632

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:08:53 -07:00
Sean Li
df96ca8889 Cannot create app from image without exposed port. 2014-10-17 11:08:23 -07:00
Sean Li
105fb835f2 Cannot create app from image without exposed port. 2014-10-17 11:08:23 -07:00
Tibor Vass
6ac9768eaf Merge pull request #8569 from jfrazelle/Cleanup-errorOut-resp 
Cleanup: integration-cli (get rid of errorOut)
 2014-10-17 13:36:00 -04:00
Alexandr Morozov
83761be409 Merge pull request #8635 from blakery/master 
Cleanup: Removed unused function layerArchive
 2014-10-17 10:28:22 -07:00