clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,407 Commits 9 Branches 112 Tags
e23d07a110fcf615bf36defd76e7be06cd7e80df
Commit Graph
12407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle 7ebcdad030 Merge pull request #9238 from albers/bash-completion 
Add missing options to bash completion for the run and create commands
 2014-11-25 09:27:31 -08:00
James Turnbull ec8c53228a Removed extraneous ) 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-11-25 10:38:16 -05:00
Yohei Ueda dfcf05a5d0 Use termios via CGO only on Linux 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
 2014-11-25 20:49:01 +09:00
Tatsushi Inagaki 82a5cd0d37 Fix to avoid a compilation error of size_test.go with GCCGO due to float to int truncation 
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
 2014-11-25 18:12:22 +09:00
Harald Albers eac9f2e5c4 Minor bash completion cleanup 
The -n and --networking options were removed because they are
unsupported. 
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.

Signed-off-by: Harald Albers <github@albersweb.de>
 2014-11-25 08:53:13 +01:00
Harald Albers 2e863e8a38 Add missing options to bash completion for the run and create commands 
Signed-off-by: Harald Albers <github@albersweb.de>
 2014-11-25 08:53:12 +01:00
Tatsushi Inagaki 36560a76d7 Revert "Fix to avoid a compile error due to float to int truncation with GCCGO" 
This reverts commit 967a42f116.

Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>

Roll back the change to fix the parameter of HumanSize from int64 to float64
 2014-11-25 16:48:09 +09:00
Andrew C. Bodine efb8e8a345 Closes #9296 adds a more detailed note about the mount behavior with -v flag 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2014-11-24 23:41:49 -08:00
Vincent Batts 7f84174109 tarsum: updates for jamtur01 comments 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-24 23:18:48 -05:00
Vincent Batts 3d6e63e0c4 pkg/tarsum: review cleanup 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-24 23:18:48 -05:00
Vincent Batts 3e08fb5ad2 pkg/tarsum: review amendments 
(separate commit to preserve github conversation)

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-24 23:18:48 -05:00
Vincent Batts f30fee69b1 pkg/tarsum: specification on TarSum checksum 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-11-24 23:18:47 -05:00
Jessie Frazelle 27127437a6 Merge pull request #9224 from tianon/custom-debootstrap 
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
 2014-11-24 18:11:59 -08:00
Mike Snitzer b9f1b0a751 devmapper: cleanup some extraneous branching in setupBaseImage() 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
 2014-11-24 20:06:41 -05:00
Tibor Vass 498985a039 Merge pull request #9325 from unclejack/add_1.3.2_relnotes 
docs: Add 1.3.2 release notes
 2014-11-24 20:06:34 -05:00
Tibor Vass 4dd3368b51 docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 03:02:27 +02:00
Tibor Vass e6ec703df3 Merge pull request #9323 from unclejack/merge_release_v1.3.2 
Merge release v1.3.2 to master
 2014-11-24 19:26:36 -05:00
Jessie Frazelle 2ad98b0cfa Merge pull request #9324 from crosbymichael/git-urls 
Move IsGIT and IsURL to urlutil package
 2014-11-24 16:07:42 -08:00
Tibor Vass b21e1d4a00 Add v1.3.2 changelog & bump version to 1.3.2-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-25 02:07:01 +02:00
unclejack 2ec2237909 graph/load: add build tags to fix make cross 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-25 02:06:45 +02:00
Michael Crosby 5794b5373e Update code for use of urlutil pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-24 18:47:42 -05:00
Michael Crosby fc66a22df6 Merge pull request #9173 from vbatts/vbatts-dm_clarify_TaskCreate 
pkg/devicemapper: clarify TaskCreate and createTask
 2014-11-24 15:45:54 -08:00
Victor Vieux 4996d46a36 Merge pull request #9289 from duglin/mflagSetTest 
Add missing unit testcase for new IsSet() func in mflag
 2014-11-24 15:26:25 -08:00
Michael Crosby feca1b1780 Move git and url checks into pkg 
This moves the IsGIT and IsURL functions out of the generic `utils`
package and into their own `urlutil` pkg.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-24 18:10:37 -05:00
Tibor Vass f6d9780229 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
unclejack 330171e1d9 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-25 01:03:41 +02:00
Tibor Vass 31d1d73303 archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
Tibor Vass 1852cc3841 archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-25 01:03:41 +02:00
Tibor Vass 221617dbcd archive: add breakout tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	pkg/archive/archive.go
		fixed conflict which git couldn't fix with the added BreakoutError

Conflicts:
	pkg/archive/archive_test.go
		fixed conflict in imports
 2014-11-25 01:03:41 +02:00
unclejack 209deff963 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/graphdriver/aufs/aufs_test.go
		fixed conflict caused by imports
 2014-11-25 01:03:40 +02:00
Tibor Vass 9c01bc249d pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	graph/load.go
		fixed conflict in imports
 2014-11-25 01:03:40 +02:00
unclejack 1cb17f03d0 add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	builder/internals.go
	daemon/graphdriver/aufs/aufs.go
	daemon/volumes.go
		fixed conflicts in imports
 2014-11-25 01:03:40 +02:00
Michael Crosby fa1484d12c Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-25 01:03:40 +02:00
Michael Crosby 294843ef23 Move security opts to HostConfig 
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.

We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct.  Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	daemon/create.go
		changing config to hostConfig was required to fix the
		 build
 2014-11-25 01:02:30 +02:00
Michael Crosby df7c22dd23 Merge pull request #9162 from aidanhs/patch-1 
Allow git@ urls for more than just github
 2014-11-24 14:51:52 -08:00
unclejack faab87cc36 pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-25 00:27:05 +02:00
Tibor Vass 6f514d28c0 Merge pull request #9316 from tiborvass/bump_v1.3.2 
Bump v1.3.2
 2014-11-24 16:49:28 -05:00
Jessie Frazelle 39284be960 Merge pull request #9263 from cpuguy83/docs_cleanup_exec_api 
Cleanup exec API docs and available params
 2014-11-24 13:35:45 -08:00
Aidan Hobson Sayers c7e4cc4a53 Allow git@ prefixes for any hosted git service 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2014-11-24 20:49:54 +00:00
Tianon Gravi 748fe7a0fa Merge pull request #9291 from vincentbernat/fix/zsh-completion-update-2 
zsh: correctly parse available subcommands (completion)
 2014-11-24 13:36:58 -07:00
Michael Crosby b4757445ae Merge pull request #9301 from krivenok/master 
Fixed typo in documentation.
 2014-11-24 12:27:56 -08:00
Michael Crosby 5e19ecf25c Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
 2014-11-24 12:10:45 -08:00
Jessie Frazelle fefaf6a73d Merge pull request #9290 from vaijab/registry-address 
registry: fix ServerAddress setting
 2014-11-24 12:02:12 -08:00
Jessie Frazelle 66266a0ed9 Merge pull request #9312 from daehyeok/deprecated_cmd 
remove deprecated cmd function in integration-cli
 2014-11-24 11:58:13 -08:00
Michael Crosby cbc401ccfa Merge pull request #9303 from rmetzler/patch-1 
Empty Line should fix Markdown unordered list
 2014-11-24 11:55:21 -08:00
Vincent Batts e07daa58d9 contrib: fix the docker-device-tool 
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-11-24 13:49:09 -05:00
Vaidas Jablonskis d96832cbd2 registry: fix ServerAddress setting 
This ensures that ServerAddress is set, while previously it was getting
set after configFile.Configs.

Signed-off-by: Vaidas Jablonskis <jablonskis@gmail.com>
 2014-11-24 18:26:41 +00:00
Dmitry V. Krivenok 5deedef42c Made wording a bit more generic. 2014-11-24 21:22:54 +03:00
Tibor Vass 39fa2faad2 Bump to version v1.3.2 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
v1.3.2 		2014-11-24 12:38:01 -05:00
Tibor Vass 324953d74a docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-24 12:38:01 -05:00