clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-27 03:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,555 Commits 9 Branches 112 Tags
8c575f263dff23bec76dd0aa169e278fe4bfcb74
Commit Graph

13555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mary Anthony 8c575f263d Rewrite the Contributing tree as Project in preparation for the Docker birthday. 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>

Optimize images, remove old file, add metadata tagging

Signed-off-by: Mary Anthony <mary.anthony@docker.com>
 2015-03-06 14:10:55 -08:00
Sven Dowideit e058b7980d Merge pull request #11195 from ahmetalpbalkan/doc/remote-api-kind 
doc/api: explain Kind (ChangeType)
 2015-03-07 07:19:29 +10:00
Phil Estes cfe5767045 Merge pull request #11202 from coolljt0725/fix_start_hijacked 
Fix start container failed hijack the stdin of terminal
 2015-03-06 13:48:02 -05:00
moxiegirl 55fc7f5c9d Merge pull request #11204 from duglin/VolumeDocs 
Tell users about how VOLUME initializes the new mount point/volume
 2015-03-06 10:44:03 -08:00
Tibor Vass ecea4a9cc2 Merge pull request #11186 from ahmetalpbalkan/win-cli/TestBuild-case-sensitive-fix 
integ-cli: skip case-sensitive dockerfile tests on windows
 2015-03-06 13:43:01 -05:00
Phil Estes c94eb28af0 Merge pull request #10675 from brahmaroutu/events_filterbyimage_10645 
Allow use of just image name without the tag
 2015-03-06 13:38:41 -05:00
Tianon Gravi f5538dc3bc Merge pull request #11196 from ahmetalpbalkan/win-cli/TestRunCidFileCleanupIfEmpty-fix 
integ-cli: fix test requiring scratch
 2015-03-06 11:32:35 -07:00
Doug Davis 9be2ca2394 Tell users about how VOLUME initializes the new mount point/volume 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-06 10:25:47 -08:00
Tibor Vass a6ddb8de42 Merge pull request #11148 from ahmetalpbalkan/win-cli/chmod-x-fix 
pkg/archive: adjust chmod bits on windows
 2015-03-06 12:28:58 -05:00
Lei Jitang 518fdf972d Fix start container failed hijack the stdin of terminal 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-06 09:06:14 -08:00
Ahmet Alp Balkan 3a70f9d422 integ-cli: fix test requiring scratch 
TestRunCidFileCleanupIfEmpty fails on windows/mac because the test runs
the command `docker run scratch` and it gives the following error:

	Unable to find image 'scratch:latest' locally
	Pulling repository scratch
	511136ea3c5a: Download complete
	FATA[0004] 'scratch' is a reserved name

I am not entirely sure if this is a test issue or not but I had a quick
workaround by creating another image using `FROM scratch` and using that.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-06 08:52:40 -08:00
Phil Estes dd3746973e Merge pull request #11122 from tianon/simple-dockerfile 
Add secondary "simple" Dockerfile
 2015-03-06 11:52:07 -05:00
Jessie Frazelle aa1dce8eda Merge pull request #11175 from coolljt0725/fix_build_bash_completion 
Fix docker build -f bash completion and docker run bash completion
 2015-03-06 15:53:48 +00:00
Lei Jitang 00d3727106 Fix docker build and docker run bash completion 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-06 15:35:52 +08:00
Ahmet Alp Balkan 957bc8ac50 remote api: explain Kind (ChangeType) 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-05 19:39:14 -08:00
Doug Davis 2a8a2d2428 Merge pull request #11189 from ahmetalpbalkan/win-cli/archive-path-separator 
pkg/archive_windows: make use of os.PathSeparator
 2015-03-05 22:25:20 -05:00
Tibor Vass 94fca50de0 Merge pull request #11125 from moypray/http_proxy 
docker info display http/https_proxy setting
 2015-03-05 20:26:20 -05:00
Ahmet Alp Balkan 8ba64b383d pkg/archive_windows: make use of os.PathSeparator 
cc: @jhowardmsft

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-05 17:15:11 -08:00
Zhang Wentao 06a40f0f28 docker info display http/https_proxy setting 
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
 2015-03-06 09:02:21 +08:00
Ahmet Alp Balkan d046f56e88 integ-cli: skip case-sensitive dockerfile tests on windows 
The tests end up overwriting the `dockerfile` with `Dockerfile` since
windows filesystems are case-insensitive. The following methods are
skipped:

- TestBuildRenamedDockerfile
- TestBuildFromMixedcaseDockerfile

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-05 15:50:15 -08:00
Michael Crosby 92e632c84e Merge pull request #11064 from delftswa2014/10970-treesize 
Move directory size calculation to pkg/ (fixes #10970)
 2015-03-05 13:06:02 -08:00
Michael Crosby c40993777f Merge pull request #11138 from tianon/go-autogen 
Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
 2015-03-05 13:00:32 -08:00
Michael Crosby 78989424bc Merge pull request #11179 from rhatdan/selinux-fixes 
Two SELinux Changes.
 2015-03-05 12:19:10 -08:00
Michael Crosby 27acf7b4ac Merge pull request #11156 from jfrazelle/ulimit-skip-lxc 
Skip new ulimits test on lxc
 2015-03-05 12:18:52 -08:00
Michael Crosby 0bf6015745 Merge pull request #11172 from duglin/5169-LinkEnvDocs 
Add some text about env vars when linking containers
 2015-03-05 12:18:04 -08:00
Dan Walsh 4eb2fd169f Two SELinux Changes. 
daemon/volumes.go

  This SetFileCon call made no sense, it was changing the labels of any
directory mounted into the containers SELinux label.  If it came from me,
then I apologize since it is a huge bug.

The Volumes Mount code should optionally do this, but it should not always
happen, and should never happen on a --privileged container.

The change to

daemon/graphdriver/vfs/driver.go, is a simplification since this it not
a relabel, it is only a setting of the shared label for docker volumes.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-05 13:55:44 -05:00
Fred Lifton e4a90897e1 Merge pull request #11151 from chenhanxiao/See-also-export-import-save-load 
docs: add See Also for description of export/import and save/load
 2015-03-05 10:35:37 -08:00
Doug Davis 3c9425d40d Add some text about env vars when linking containers 
In particular, the security implications.

Closes #5169

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-05 09:39:10 -08:00
Brian Goff 620339f166 Merge pull request #11173 from estesp/cleanup-etc-cover-test 
Clarify/cleanup "/etc" volume overlays special /etc mounts test
 2015-03-05 10:47:36 -05:00
Phil Estes 214eae6f53 Merge pull request #11163 from duglin/RmiTest 
Better error message for `docker rmi ''`
 2015-03-05 09:49:46 -05:00
Phil Estes b5036ad5c6 Clarify/cleanup "/etc" volume overlays special /etc mounts test 
Added link to original issue and clarified text so someone without any
background on the original issue can understand why the test exists.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-05 09:41:56 -05:00
Jessie Frazelle 7125ae00bb Merge pull request #11168 from estesp/no-inotify-overlayfs 
Don't test resolv.conf updater on overlay filesystem
 2015-03-05 14:04:22 +00:00
Phil Estes 9057ca2541 Don't test resolv.conf updater on overlay filesystem 
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed.  The new test
(from #10703) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.

This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.

See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-05 00:22:01 -05:00
Chen Hanxiao cbb149f52f docs: add See Also for description of export/import and save/load 
make them reference to each other.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-03-04 20:21:38 -05:00
Ahmet Alp Balkan 1a22418f9f pkg/archive: adjust chmod bits on windows 
This change modifies the chmod bits of build context archives built on
windows to preserve the execute bit and remove the r/w bits from
grp/others.

Also adjusted integ-cli tests to verify permissions based on the platform
the tests are running.

Fixes #11047.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-04 14:10:37 -08:00
Alexander Morozov 5035fa1e21 Merge pull request #11162 from SvenDowideit/if-nil-call-with-nil 
Seems like an un-necessary if statement
 2015-03-04 13:59:27 -08:00
Sven Dowideit 4e5ea0c875 Seems like an un-necessary if statement 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-03-04 13:24:17 -08:00
Doug Davis eeb36c9348 Better error message for "docker rmi ''" 
See: https://github.com/docker/docker/issues/10867

While looking at #10867 I noticed that the error message generated for
a blank image ID wasn't very helpful so this fixes that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-04 13:21:59 -08:00
Martijn Dwars e2b8933d21 Move directory size calculation to pkg/ (fixes #10970) 
Signed-off-by: Martijn Dwars <ikben@martijndwars.nl>
 2015-03-04 21:16:31 +01:00
Alexander Morozov e0823b09ec Merge pull request #11000 from anandkumarpatel/invalidate-probe 
Improve build speed
 2015-03-04 11:35:00 -08:00
Jessie Frazelle 7b3ffd5cc0 Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
 2015-03-04 18:42:20 +00:00
Jessie Frazelle 4bccf278bd Merge pull request #11046 from bfirsh/rename-fig-to-compose 
Rename fig to compose
 2015-03-04 08:39:01 -08:00
Ben Firshman a6824ea7f2 Rename fig to compose 
It's now at https://github.com/docker/compose

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-04 16:35:56 +00:00
Jessica Frazelle 80d585b0c7 Skip new ulimits test on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-04 08:28:32 -08:00
Phil Estes 2380004d30 Merge pull request #10713 from swagiaal/pickup-created-resolvconf 
Update resolv.conf in containers on file creation.
 2015-03-04 10:21:36 -05:00
Tibor Vass 973c32c8a0 Merge pull request #11147 from ahmetalpbalkan/archive_test_fix 
pkg/archive: rm invalid test case from achive_windows_test.go
 2015-03-04 09:51:36 -05:00
Tibor Vass ffc738225d Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests 
Last three tests skip on lxc.
 2015-03-04 09:51:06 -05:00
Jessica Frazelle 321874f376 Last three tests skip on lxc. 
Now we can scale lxc tests to all PRs.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-04 06:04:25 -08:00
Jessie Frazelle 0f6704f961 Merge pull request #11077 from tianon/debootstrap-PATH 
Update debootstrap PATH+chroot handling
 2015-03-04 06:01:25 -08:00
Jessie Frazelle ffc755ac14 Merge pull request #11134 from duglin/CheckMultiLineHelp 
Fix 'docker ps --help' so the options don't span more than one line
 2015-03-04 05:53:47 -08:00