toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,265 Commits 3 Branches 295 Tags
c77458bef612cec6ea39edd117ba4a4e25972d3a
Commit Graph
12265 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby ad55909560 Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34f5d94b2cfb0a5401b31f3b669ae6579d8126a8
Component: engine
 2014-02-11 03:33:18 -08:00
Michael Crosby 40c8407540 Merge pull request #5 from tianon/null-terminators-are-important 
Add comment clarifying null termination
Upstream-commit: 2205707084c7cc5d2422a0b03e97cbf8632039d5
Component: engine
 2014-02-11 12:33:07 -05:00
Tianon Gravi 3f55cc6f41 Add comment clarifying null termination 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c626349f651a660302f64101055d65dc6e990307
Component: engine
 2014-02-11 10:32:31 -07:00
Michael Crosby 6d92748c6f Exec out to ip right now for creating the veth pair 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27ed9a9f98750ab666d6221553b6f4ea59d396b8
Component: engine
 2014-02-11 03:32:35 -08:00
Sven Dowideit d33fce79f6 add a little more information about the docker run -P option 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b2146cb0e7a23553d1520ed87837a1b5455c9130
Component: engine
 2014-02-11 20:34:26 +10:00
Alexander Larsson 96a42d5055 lxc: Drop NET_ADMIN capability in non-privileged containers 
With this capability set the container can e.g. change the ip address
of his devices to that of another container on the docker0 bridge. In
a quick test I was able to listen to a port on a different ip than the
one docker assigned me, but was not able to hijack an open port
redirection that another container had open. Maybe its possible with
some more knowledge of networking though.

Anyway, network setup is meant to be handled by docker, not the apps,
so I believe denying this is generally in the spirit of docker, and
it closes down potential security issues.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 02fddffd51da782f912e2709ea814c330269515b
Component: engine
 2014-02-11 11:17:34 +01:00
Alexander Larsson 9ca9fdc33f devicemapper: Fix tests on fedora 
If /dev/loop-control exists on the system running the test then
ioctlLoopCtlGetFree() will be called, but if not it won't.  It does
not exist in the standard docker build environment, so the tests
currently require this to not be called. This makes it instead
optional, allowing the tests to run on e.g. Fedora.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: eb4578daee98561b16d11d2978b5f5e297d903e8
Component: engine
 2014-02-11 09:42:34 +01:00
Alexander Larsson abb4de8546 devmapper: Remove directory when removing devicemapper device 
We're currently leaving around lots of empty directories in
/var/lib/docker/devicemapper/mnt/ for removed images and containers.
Fix this by removing the directory when the device is removed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2343fe44533f19ebae5e6127f4a2a19d1d8773fa
Component: engine
 2014-02-11 09:40:13 +01:00
Michael Crosby c0caaa92a3 Add more netlink functions for set ns by fd and bring iface down 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f9cd1be6ffbda85f20cc7926274fab7484a19823
Component: engine
 2014-02-10 22:32:07 -08:00
Sven Dowideit 71b22701b5 add a little info on upgrading 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 82863aecab824118e223b53fed905ed5fd9182bb
Component: engine
 2014-02-11 14:58:42 +10:00
Sven Dowideit 11beb9de93 point out that ENV DEBIAN_FRONTEND will persist, so its not recommended 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c4b9e1c9add2ab3c97cc89c8f6b12b83750cea1d
Component: engine
 2014-02-11 13:16:54 +10:00
Michael Crosby 1093e871da Allow add of empty name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4dec36d1ee8cfd8b396210daa5367d146bbb34bc
Component: engine
 2014-02-10 16:41:16 -08:00
Sven Dowideit 06def9a48b bring back the explaination of our LGTM process 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 5051b8610d7802db2d479cfba14009552a95789f
Component: engine
 2014-02-11 10:10:50 +10:00
Victor Vieux 7dcdfb0d44 fix --run in docker commit 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5d29749e9dba4d918fc5ed5d6049f397e98967cf
Component: engine
 2014-02-10 23:52:15 +00:00
Andy Rothfusz 22eab6c016 Merge pull request #4019 from ostezer/fix-installation-windows-doc-title 
docs: Installation Instruction Title & Description Fixes
Upstream-commit: 2975ba6f7315bc4f1e41f6523ab927572d3aafd0
Component: engine
 2014-02-10 15:26:32 -08:00
Victor Vieux 3665663666 Merge pull request #3524 from tianon/supplementary-groups 
Add supplementary groups lookup in sysinit
Upstream-commit: 2dcb48af0fa9bba2fb47b08dd2c9747acf09ea44
Component: engine
 2014-02-10 14:42:14 -08:00
Victor Vieux 79c6233460 Merge pull request #3871 from jdef/patch-1 
Update lxc_template.go
Upstream-commit: 036900a63adf9621c4e0f4c162f89da2f4171453
Component: engine
 2014-02-10 14:38:39 -08:00
Michael Crosby 6da2235591 Create veth pair via netlink 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 38eabfa65c5be78a08a8287b600e230dbe0bfac5
Component: engine
 2014-02-10 13:37:16 -08:00
O.S.Tezer 2095048f8c docs: Installation Instruction Title & Description Fixes 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

1. All titles are listed by simple platform names apart from Windows' "Installing Docker On Windows". Changed this to "Windows" to match the rest.

2. Some articles' description (and title) information does not match the majority. Modified them to match the rest (i.e. Please note this project is currently under heavy development. It should not be used in production.)

3. Removed "Linux" from Gentoo & Ubuntu descriptions.
Upstream-commit: 10d57b648fe77fe34642d0af6c5c010ff1180c85
Component: engine
 2014-02-10 23:34:56 +02:00
Guillaume J. Charmes 9a1d113883 Merge pull request #4026 from crosbymichael/fix-linking-icc 
Add bidirectional iptables rule back to links
Upstream-commit: 63f0bbaf14a8e665409cfdb38e77d5bf77709298
Component: engine
 2014-02-10 13:13:28 -08:00
Tianon Gravi f694361fe5 Add better ".git" detection and use 
This way, packagers can set GIT_DIR appropriately if they'd prefer to not have ".git" inside their working directory.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0a0406450fb83f4ff7d08235cd3e94ea8fba752f
Component: engine
 2014-02-10 13:48:43 -07:00
Guillaume J. Charmes 1f10c0734d Merge pull request #3983 from creack/remove_linux_specific 
Remove linux specific calls
Upstream-commit: 19e01a63630737b43dd13cc3cac57b158ff25de1
Component: engine
 2014-02-10 12:10:38 -08:00
Guillaume J. Charmes 2b129f1c41 Merge pull request #4042 from crosbymichael/allow-empty-cmd 
Improve no command handling
Upstream-commit: b42e669a190db43c9d9aa7a01153197bf9a1c9ab
Component: engine
 2014-02-10 11:53:14 -08:00
Michael Crosby 5fb9dcf843 Improve get if socket loop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27df18ff11dbfc22ca539462710abf07d507c0d9
Component: engine
 2014-02-10 11:36:23 -08:00
Michael Crosby 4ce6d81f0d Improve no command handling 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 44821158409d59024173336188e087c605e1da1a
Component: engine
 2014-02-10 11:04:24 -08:00
Guillaume J. Charmes fecffaa7b6 Merge pull request #4017 from alexlarsson/skip_block_zeroing 
devmapper: Enable skip_block_zeroing
Upstream-commit: 66f639e8a6d299789426ca21bd427722e8ccbd92
Component: engine
 2014-02-10 10:33:37 -08:00
Michael Crosby 3390e64221 Merge pull request #4031 from tianon/gopath 
Add slightly better GOPATH detection/handling
Upstream-commit: 6174bad135666339cc261d10fce092d64d62089b
Component: engine
 2014-02-10 13:06:41 -05:00
Michael Crosby 84218fb3cf Merge pull request #4013 from creack/remove_panic_lxc 
Remove panic in lxc driver.
Upstream-commit: 40ede286b820ec5723f2c5123dbafaf36649d406
Component: engine
 2014-02-10 12:52:52 -05:00
Michael Crosby 33cd5e68ce Merge pull request #4 from tianon/slight-netlink-cleanup 
Update NetworkChangeName to be more similar to my original
Upstream-commit: ccf2b96fbc1b19749bee730db5623b9bc882c147
Component: engine
 2014-02-10 01:42:05 -05:00
Tianon Gravi aa80369d9a Add slightly better GOPATH detection/handling 
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d3d85d38fb5bdd0327fdc9fe8b637cb0f4e1dcf2
Component: engine
 2014-02-09 18:21:01 -07:00
Tianon Gravi aaca90f4b6 Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3a7c144e9992591f32daf2d4f1b35b7b6520a07e
Component: engine
 2014-02-09 18:14:17 -07:00
Andrew Williams a535869482 Adjust test to match its comment 
Docker-DCO-1.1-Signed-off-by: Andrew Williams <williams.andrew@gmail.com> (github: TheDude05)
Upstream-commit: 95bcb8924ac2cbe0fb625a604d2c6d5a8e2fa06a
Component: engine
 2014-02-09 15:36:04 -06:00
Michael Crosby c36542fc7c Replace my C code with tianons Go code 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 524416560a4624d30023db32101c9fe5ebffc895
Component: engine
 2014-02-09 05:54:13 -08:00
Guillaume J. Charmes de9b1efd2f Remove linux specific calls 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 3dfc910d7774d57c533b067fbe59d6b24dd803cd
Component: engine
 2014-02-09 04:23:57 -08:00
Michael Crosby 64b4ce5805 Add bidirectional iptables rule back to links 
Fixes #4014
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0cba91e26447e14260f111bef6d3745d2dd55444
Component: engine
 2014-02-09 01:43:46 -08:00
Alexander Larsson 81f4bd236b devmapper: Enable skip_block_zeroing 
This makes the device mapper not zero out blocks allocated on the
thinp device. This is safe in our use case, as we access the device
via a filesystem that doesn't leak any uninitialized data to userspace.

This partially helps with https://github.com/dotcloud/docker/issues/3280
and should generally improve preformance on the devicemapper backend.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 695719b29a6311a56faae0c6ed3c985b7a75add0
Component: engine
 2014-02-09 07:29:28 +01:00
Michael Crosby 347c7fca0d Use c to change interface name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ee39033073ece35e91c6c5a8cb66d23246511fb0
Component: engine
 2014-02-08 20:44:04 -08:00
Tianon Gravi 31b1c10e09 Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 72c72f91c621d9dd2431eee01a28a4ca490588bc
Component: engine
 2014-02-08 11:34:11 -07:00
Michael Crosby e66ed158d6 Add network set interface in namespace by pid 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e3762e8d6937741a5654b1443f95beb784f018f1
Component: engine
 2014-02-08 10:03:16 -08:00
Michael Crosby 7920ed3ee7 Add set master for interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a6c791e8a92f29a2ae2c6bc81e4ab873d3ceb41f
Component: engine
 2014-02-08 09:53:04 -08:00
Guillaume J. Charmes 29b4f1c123 Remove panic in lxc driver. 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 7c06d5e34e2ebf5006ce3a34438f18c071153e97
Component: engine
 2014-02-07 19:09:52 -08:00
Andy Rothfusz 60784e353c Merge pull request #3987 from SvenDowideit/warn-against-symlinks 
please, for the love of Docker, do. not. use. symlinks
Upstream-commit: 8228e50581faadfb1626fa18b50cc7a6309d6b43
Component: engine
 2014-02-07 18:48:19 -08:00
Guillaume J. Charmes 1d05c3f324 Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel 
remove mention of #docker-meeting
Upstream-commit: 105188be2e321bb462edccfdddbeda2a12a74bc9
Component: engine
 2014-02-07 16:28:10 -08:00
Michael Crosby a58e2667ed Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer 
pkg: systemd: add initial MAINTAINERS
Upstream-commit: 36aafeb0b49b096df6967b7681a7676b36abbc3b
Component: engine
 2014-02-07 12:32:21 -05:00
Sven Dowideit 9e9837fce8 please, for the love of Docker, do. not. use. symlinks 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f787bec4a6853b46b1ba755d4f8a2ee07d9cbd3e
Component: engine
 2014-02-07 20:20:41 +10:00
German DZ 1097b506cc Instructions for Textmate's bundle installation 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: ac06646b1fb7172937c52d5f1217dcac5a86f0f9
Component: engine
 2014-02-07 09:30:11 +01:00
German DZ 4f66485afb New folder structure to support TextMate2 bundles format 
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar> (github: GermanDZ)
Upstream-commit: f289b3a19e03b99a6618009320abaec2c0cf1ec1
Component: engine
 2014-02-07 09:29:14 +01:00
Dafydd Crosby 9378ca24df Fix RST formatting 
Upstream-commit: b2945f27767f35a273feb6e255945f3e1f6108d2
Component: engine
 2014-02-07 00:10:47 -07:00
Andy Rothfusz 25d86837fc Merge pull request #3984 from jamtur01/secfaw 
Added Security FAQ question
Upstream-commit: 31a1a815c4f3a9a651c3c87bebaead252c147874
Component: engine
 2014-02-06 17:40:59 -08:00
James Turnbull f006ee4708 Added Security FAQ security 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 55b74bfe469115f25a52c6ad48b13eb9c7e6197c
Component: engine
 2014-02-07 01:42:11 +01:00