Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
moby/moby
Acidburn0zzz/docker
AdamOssenford/docker-pi
BrianBland/docker
Chhunlong/docker
ChristianKniep/docker
DCdrone/docker
DarknessBeforeDawn/docker
Gandi/docker
HabtomW/docker
HewlettPackard/docker
ImadBouirmane/docker
Keensyst/moby
KoyoTakenoshita/docker
Kunge/docker
Microsoft/docker
NERSC/docker
Ninir/docker
NunoEdgarGub1/docker
PaulSec/docker
RepmujNetsik/docker
SHAKESMIN/docker
SaiedKazemi/docker
Shopify/docker
StefanScherer/docker
StevenLudwig/docker
WeiZhang555/moby
Xethron/docker
ZJU-SEL/docker
Zekom/docker
ZenikaOuest/docker
aaronkempf/docker
ablox/docker
aboch/docker
aetherical/docker
albers/moby
alexlarsson/docker
alibaba/docker
allencloud/docker
alongyin/docker
amirdaneshvar/docker
anshulr/docker
armbuild/docker
ascii1011/docker
atlassian/docker
bfirsh/docker
bilzat/docker
blakmatrix/docker
boucher/docker
bradfitz/docker
brahmaroutu/docker
brandon-rhodes/docker
brianm/docker
campoy/docker
chenchun/docker
chenweihua/docker
clearlinux/docker
clnperez/moby
cnmxiaobudian/docker
coreos/docker
coreysa/docker
crosbymichael/docker
dansowter/docker
darkain84/docker
dashengSun/docker
dave-tucker/docker
deepglint/docker
delftswa2014/docker
destari/docker
dianping/docker
divya88ssn/docker
djangosporti/docker
docker/engine
dockerparis/docker-pot
dockervlan/docker
dqminh/moby
duglin/docker
edx/docker
ehazlett/moby
elliswuuuuuuuu/docker
ercanucan/docker
favey/docker
fcwu/docker
freebsd-docker/docker
garethr/docker
gdi2290/docker
ghigt/docker-pot
gogradle/moby
gurjeet/docker
hansent/docker
hcu5555/docker
heartlock/docker
hefen1/docker
heroku/docker
hougie/docker
hypriot/docker
hzrandd/docker
ianmiell/docker
is-yangchen/docker
jamtur01/docker
jefby/docker
jeremyeder/docker
jessfraz/docker
jingruhou/docker
jishandong/docker
jlhawn/docker
joanbarros/docker
joeygibson/docker
johngossman/docker
josemonsalve2/docker
jpetazzo/docker
justsml/docker
keithhkcss2015/docker
kongxianghe1234/docker
krishnazure/docker
kstaken/docker
kvasdopil/docker
kzys/docker
lethegit/docker
lfneves/docker
llunved/docker
luxas/docker
marcin-at-taulia/docker
mavenugo/docker
maxwell92/docker
medallia/docker
melchips/docker
mengqingshare/docker
mephux/docker
michaelnju/docker
miminar/docker
montecarlo1/docker
moxiegirl/docker
mpatlasov/docker
mwhudson/docker
nanjj/docker
nathanleclaire/docker
navin70/docker
netmarine/docker
nicklv/docker
ningjh/docker
nosy/docker
odin1314/docker
only4funny/docker
petar/gocircuit-docker
poreotics/docker
princeqjzh/docker
princessd8251/docker
projectatomic/docker
putztzu/docker
qifei8/docker
rastabrane/docker-1
resin-io/docker
resouer/docker
reteptilian/docker
rhatdan/moby1
rhvgoyal/moby
robin-zhou/docker
robryk/docker
roth1002/docker
runcom/docker
rwincewicz/docker
sachin-jayant-joshi/docker
sarar04/docker
sc4599/docker
seblu/docker
sexybear/docker
sh0tt/docker
shinvdu/docker
shravaniv/docker
shykes/docker
slavau/docker
snitm/docker
spf13/docker
splunk/docker
srevereault/docker
sss9991/docker
tagomoris/docker
thieman/docker
tiw/docker
tmc/docker
tomwilkie/docker
tpounds/docker
twosigma/docker-old
victorbriz/docker
vmware/docker
wallaceok/docker
weizhenwei/docker
witcxc/docker
wlan0/docker
xianlubird/docker
xq262144/docker
yang1992/docker
ycaihua/docker
yingmsky/docker
yorkie/docker
yosifkit/docker
zb-basketball/docker
zcnrex/docker
zhli000/docker
Nothing to show
Choose a Head Repository
moby/moby
Acidburn0zzz/docker
AdamOssenford/docker-pi
BrianBland/docker
Chhunlong/docker
ChristianKniep/docker
DCdrone/docker
DarknessBeforeDawn/docker
Gandi/docker
HabtomW/docker
HewlettPackard/docker
ImadBouirmane/docker
Keensyst/moby
KoyoTakenoshita/docker
Kunge/docker
Microsoft/docker
NERSC/docker
Ninir/docker
NunoEdgarGub1/docker
PaulSec/docker
RepmujNetsik/docker
SHAKESMIN/docker
SaiedKazemi/docker
Shopify/docker
StefanScherer/docker
StevenLudwig/docker
WeiZhang555/moby
Xethron/docker
ZJU-SEL/docker
Zekom/docker
ZenikaOuest/docker
aaronkempf/docker
ablox/docker
aboch/docker
aetherical/docker
albers/moby
alexlarsson/docker
alibaba/docker
allencloud/docker
alongyin/docker
amirdaneshvar/docker
anshulr/docker
armbuild/docker
ascii1011/docker
atlassian/docker
bfirsh/docker
bilzat/docker
blakmatrix/docker
boucher/docker
bradfitz/docker
brahmaroutu/docker
brandon-rhodes/docker
brianm/docker
campoy/docker
chenchun/docker
chenweihua/docker
clearlinux/docker
clnperez/moby
cnmxiaobudian/docker
coreos/docker
coreysa/docker
crosbymichael/docker
dansowter/docker
darkain84/docker
dashengSun/docker
dave-tucker/docker
deepglint/docker
delftswa2014/docker
destari/docker
dianping/docker
divya88ssn/docker
djangosporti/docker
docker/engine
dockerparis/docker-pot
dockervlan/docker
dqminh/moby
duglin/docker
edx/docker
ehazlett/moby
elliswuuuuuuuu/docker
ercanucan/docker
favey/docker
fcwu/docker
freebsd-docker/docker
garethr/docker
gdi2290/docker
ghigt/docker-pot
gogradle/moby
gurjeet/docker
hansent/docker
hcu5555/docker
heartlock/docker
hefen1/docker
heroku/docker
hougie/docker
hypriot/docker
hzrandd/docker
ianmiell/docker
is-yangchen/docker
jamtur01/docker
jefby/docker
jeremyeder/docker
jessfraz/docker
jingruhou/docker
jishandong/docker
jlhawn/docker
joanbarros/docker
joeygibson/docker
johngossman/docker
josemonsalve2/docker
jpetazzo/docker
justsml/docker
keithhkcss2015/docker
kongxianghe1234/docker
krishnazure/docker
kstaken/docker
kvasdopil/docker
kzys/docker
lethegit/docker
lfneves/docker
llunved/docker
luxas/docker
marcin-at-taulia/docker
mavenugo/docker
maxwell92/docker
medallia/docker
melchips/docker
mengqingshare/docker
mephux/docker
michaelnju/docker
miminar/docker
montecarlo1/docker
moxiegirl/docker
mpatlasov/docker
mwhudson/docker
nanjj/docker
nathanleclaire/docker
navin70/docker
netmarine/docker
nicklv/docker
ningjh/docker
nosy/docker
odin1314/docker
only4funny/docker
petar/gocircuit-docker
poreotics/docker
princeqjzh/docker
princessd8251/docker
projectatomic/docker
putztzu/docker
qifei8/docker
rastabrane/docker-1
resin-io/docker
resouer/docker
reteptilian/docker
rhatdan/moby1
rhvgoyal/moby
robin-zhou/docker
robryk/docker
roth1002/docker
runcom/docker
rwincewicz/docker
sachin-jayant-joshi/docker
sarar04/docker
sc4599/docker
seblu/docker
sexybear/docker
sh0tt/docker
shinvdu/docker
shravaniv/docker
shykes/docker
slavau/docker
snitm/docker
spf13/docker
splunk/docker
srevereault/docker
sss9991/docker
tagomoris/docker
thieman/docker
tiw/docker
tmc/docker
tomwilkie/docker
tpounds/docker
twosigma/docker-old
victorbriz/docker
vmware/docker
wallaceok/docker
weizhenwei/docker
witcxc/docker
wlan0/docker
xianlubird/docker
xq262144/docker
yang1992/docker
ycaihua/docker
yingmsky/docker
yorkie/docker
yosifkit/docker
zb-basketball/docker
zcnrex/docker
zhli000/docker
Nothing to show
Commits on Sep 23, 2013
Commits on Oct 09, 2013
Fixes issues with mounting subdirectories of /mnt in container.
Tested with
mkdir /mnt/data
docker run -v /mnt/data:/mnt/data  -t ubuntu:12.10 touch /mnt/data/bar

Expected /mnt/data/bar on host.
Commits on Oct 14, 2013
Commits on Oct 15, 2013
Refactor mkimage-debootstrap.sh to be much more full-featured
This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
Commits on Oct 17, 2013
Commits on Oct 18, 2013
Solomon Hykes
Solomon Hykes
Merge pull request #2283 from tmc/master
Make mkimage-arch.sh a little more clear
Remove spurious messages, and use proper args expansion.
Also, display some (hopefully helpful) message when no command was given.
Change bundle order, and fix shell array expansion.
I believe that it is helpful to build the binary first. That way,
if you interrupt the tests, you still get a binary to play with.
If you run the tests first and interrupt them, no binary for you!

Also, the second part of this commit is an undeniable proof that
Bash array syntax is nothing else than an elaborate troll by Bash
authors.
Solomon Hykes
Solomon Hykes
hack: encode the name of the current test in temporary directories, f…
…or easier tracking

Conflicts:
	utils_test.go
Merge pull request #2282 from shykes/fix-tests
Tests: Cleanup the test suite
Andy Rothfusz
Andy Rothfusz
Merge pull request #2281 from metalivedev/cleanupformat
Clean up build warnings. Remove redundant files.
Merge pull request #2222 from tianon/debootstrap
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
Add -nostdin and -proxy to docker attach, allow arbirary signal to be…
… sent via docker kill api endpoint

Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Add POSIX shell version of host_integration/manager.go in the style o…
…f hack/make.sh

Rename host_integration to host-integration for consistency
Commits on Oct 19, 2013
Andy Rothfusz
Andy Rothfusz
Commits on Oct 20, 2013
Update hack/install.sh with some more Ubuntu-specific installation st…
…uff while we're still on AUFS (installing linux-image-extra-$(uname -r) when we can't find AUFS to try to find AUFS)
Commits on Oct 21, 2013
Set commentstring in Vim syntax plugin
By setting the commentstring, you support commenting with plugins like tComment.
Now Vim won't default to incorrect `/* */` comments.
Commits on Oct 22, 2013
Merge pull request #2307 from gurjeet/sorted_commands_in_help
Place 'top' subcommand's help in proper order.
Merge pull request #2326 from justinforce/commentstring
Set commentstring in Vim syntax plugin
Merge pull request #2198 from hamo/hamo/chdir_error
check return value of syscall.Chdir when changing working directory
Andy Rothfusz
Andy Rothfusz
Merge pull request #2318 from Tranquility/master
Fix github link in docs
Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes
Fixes issues with mounting subdirectories of /mnt in container.
Andy Rothfusz
Andy Rothfusz
Merge pull request #2261 from edmund-wagner/master
make copy paste user friendly
Merge pull request #2338 from proppy/patch-1
Registry: Fix content-type for PushImageJSONIndex
Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix
fix race condition in docker build with verbose + cleanup hostIntegration debug
Commits on Oct 23, 2013
Update hack/make/ubuntu to make less ubuntu-centric packages, to fix …
…the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http…
…_proxy.

This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Merge pull request #2353 from wrouesnel/mkimage-debootstrap-improvements
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy
Merge pull request #2349 from shykes/runtime-cleanup
Runtime: remove unused field kernelVersion
Merge pull request #2306 from tianon/fix-ubuntu-install-aufs
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Merge pull request #2226 from tianon/init
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Merge pull request #2263 from tianon/hack-release
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Commits on Oct 24, 2013
Commits on Oct 25, 2013
Merge pull request #2383 from jpetazzo/cleanup-errclosedpipe-for-stdin
Ignore ErrClosedPipe for stdin in Container.Attach.
Merge pull request #1963 from rogpeppe/master
Client: Use less reflection in command-line method invocation
Andy Rothfusz
Andy Rothfusz
Merge pull request #2355 from xdissent/patch-1
Typo in host integration docs
Jérôme Petazzoni
Jérôme Petazzoni
Merge pull request #2378 from tianon/linkify-github-ids
Linkify @github references in the infrastructure README.md
Merge pull request #2385 from dotcloud/suppress_even_more_warnings_test
Improve tests again, remove warnings and prevent some mount issues
Solomon Hykes and vieux
Add netlink submodule
This contains various operations that can replace the use of
shelling out to "ip".
Use netlink directly instead of /bin/ip in Sysinit
The sysinit code only uses /bin/ip to set a default gateway. This
is pretty easy to do via netlink directly, so we can avoid
the ip dependency.
network: Stop shelling out to /sbin/ip
We have our own netlink version of all the required calls now, so
we can just skip the /sbin/ip dependency.
Add a network test
This just tries pinging first 127.0.0.1 and then 8.8.8.8.

We can't ping via a dns name, because libresolv.so is missing
from the test image, so dns resolving doesn't work.
Move ListOps to utils submodule
This will be needed for later use in docker-init without a docker
dependency
Move SysInit to a submodule
This allows docker-init to not import the main docker
module, which means it won't e.g. pick up any sqlite
dependencies.
Updated fixes post rebase from master
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Add dynbinary and dyntest scripts for building/testing a separate sta…
…tic dockerinit binary

After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Use persistent connection for links database
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Move iptable rules outside of create bridge
This allows the user to toggle enabling and
disabling intercontainer communication when
they run the daemon.
Commits on Oct 26, 2013
Commits on Oct 27, 2013
Commits on Oct 28, 2013
Fixes the flags for nc
The `-p` flag for `nc` should not be used with `-l`.
Merge pull request #2422 from dotcloud/links_names_generator
Add name generator for container without -name
Commits on Oct 29, 2013
Showing with 7,471 additions and 2,177 deletions.
  1. +1 −0 .gitignore
  2. +1 −0 AUTHORS
  3. +33 −0 CHANGELOG.md
  4. +5 −7 Dockerfile
  5. +1 −1 VERSION
  6. +44 −9 api.go
  7. +9 −17 api_params.go
  8. +42 −27 api_test.go
  9. +4 −1 auth/auth_test.go
  10. +16 −6 buildfile.go
  11. +6 −24 buildfile_test.go
  12. +246 −113 commands.go
  13. +81 −16 commands_test.go
  14. +18 −0 config.go
  15. +279 −85 container.go
  16. +91 −40 container_test.go
  17. +27 −0 contrib/host-integration/Dockerfile.dev
  18. +4 −0 contrib/host-integration/Dockerfile.min
  19. +130 −0 contrib/host-integration/manager.go
  20. +53 −0 contrib/host-integration/manager.sh
  21. +20 −0 contrib/host-integration/manager/systemd
  22. +15 −0 contrib/host-integration/manager/upstart
  23. +13 −0 contrib/init/openrc/docker.confd
  24. +31 −0 contrib/init/openrc/docker.initd
  25. +13 −0 contrib/init/systemd/docker.service
  26. +85 −0 contrib/init/sysvinit/docker
  27. +10 −0 contrib/init/upstart/docker.conf
  28. +12 −10 contrib/mkimage-arch.sh
  29. +1 −1 contrib/mkimage-busybox.sh
  30. +0 −83 contrib/mkimage-debian.sh
  31. +233 −0 contrib/mkimage-debootstrap.sh
  32. +1 −1 contrib/mkimage-unittest.sh
  33. +2 −0 contrib/vim-syntax/syntax/dockerfile.vim
  34. +54 −26 docker/docker.go
  35. +16 −0 dockerinit/dockerinit.go
  36. +2 −4 docs/README.md
  37. +9 −4 docs/sources/api/docker_remote_api_v1.6.rst
  38. +1 −1 docs/sources/api/index.rst
  39. +702 −38 docs/sources/commandline/cli.rst
  40. +0 −59 docs/sources/commandline/command/attach.rst
  41. +0 −65 docs/sources/commandline/command/build.rst
  42. +0 −52 docs/sources/commandline/command/commit.rst
  43. +0 −14 docs/sources/commandline/command/cp.rst
  44. +0 −13 docs/sources/commandline/command/diff.rst
  45. +0 −34 docs/sources/commandline/command/events.rst
  46. +0 −13 docs/sources/commandline/command/export.rst
  47. +0 −13 docs/sources/commandline/command/history.rst
  48. +0 −26 docs/sources/commandline/command/images.rst
  49. +0 −44 docs/sources/commandline/command/import.rst
  50. +0 −13 docs/sources/commandline/command/info.rst
  51. +0 −23 docs/sources/commandline/command/insert.rst
  52. +0 −13 docs/sources/commandline/command/inspect.rst
  53. +0 −13 docs/sources/commandline/command/kill.rst
  54. +0 −24 docs/sources/commandline/command/login.rst
  55. +0 −13 docs/sources/commandline/command/logs.rst
  56. +0 −13 docs/sources/commandline/command/port.rst
  57. +0 −17 docs/sources/commandline/command/ps.rst
  58. +0 −13 docs/sources/commandline/command/pull.rst
  59. +0 −13 docs/sources/commandline/command/push.rst
  60. +0 −13 docs/sources/commandline/command/restart.rst
  61. +0 −13 docs/sources/commandline/command/rm.rst
  62. +0 −13 docs/sources/commandline/command/rmi.rst
  63. +0 −85 docs/sources/commandline/command/run.rst
  64. +0 −14 docs/sources/commandline/command/search.rst
  65. +0 −13 docs/sources/commandline/command/start.rst
  66. +0 −15 docs/sources/commandline/command/stop.rst
  67. +0 −15 docs/sources/commandline/command/tag.rst
  68. +0 −13 docs/sources/commandline/command/top.rst
  69. +0 −7 docs/sources/commandline/command/version.rst
  70. +0 −13 docs/sources/commandline/command/wait.rst
  71. BIN docs/sources/{static_files → commandline}/docker_images.gif
  72. +2 −33 docs/sources/commandline/index.rst
  73. +1 −1 docs/sources/examples/hello_world.rst
  74. +2 −1 docs/sources/examples/index.rst
  75. +120 −0 docs/sources/examples/linking_into_redis.rst
  76. +0 −2 docs/sources/index.rst
  77. +1 −1 docs/sources/installation/kernel.rst
  78. +4 −2 docs/sources/installation/ubuntulinux.rst
  79. +1 −1 docs/sources/use/baseimages.rst
  80. +3 −1 docs/sources/use/basics.rst
  81. +1 −1 docs/sources/use/builder.rst
  82. +125 −0 docs/sources/use/host_integration.rst
  83. +1 −0 docs/sources/use/index.rst
  84. +7 −1 docs/theme/docker/layout.html
  85. +1 −0 gograph/MAINTAINERS
  86. +423 −0 gograph/gograph.go
  87. +503 −0 gograph/gograph_test.go
  88. +27 −0 gograph/sort.go
  89. +29 −0 gograph/sort_test.go
  90. +32 −0 gograph/utils.go
  91. +13 −6 hack/PACKAGERS.md
  92. +29 −3 hack/dind
  93. +88 −2 hack/infrastructure/README.md
  94. +0 −103 hack/infrastructure/overview.md
  95. +25 −6 hack/install.sh
  96. +9 −5 hack/make.sh
  97. +2 −3 hack/make/binary
  98. +15 −0 hack/make/dynbinary
  99. +42 −0 hack/make/dyntest
  100. +4 −1 hack/make/test
  101. +30 −29 hack/make/ubuntu
  102. +60 −15 hack/release.sh
  103. +2 −2 image.go
  104. +1 −0 iptables/MAINTAINERS
  105. +110 −0 iptables/iptables.go
  106. +18 −0 iptables/iptables_test.go
  107. +141 −0 links.go
  108. +104 −0 links_test.go
  109. +3 −1 lxc_template.go
  110. +30 −0 namesgenerator/names-generator.go
  111. +28 −0 namesgenerator/names-generator_test.go
  112. +548 −0 netlink/netlink.go
  113. +146 −206 network.go
  114. +7 −114 network_test.go
  115. +1 −0 proxy/MAINTAINERS
  116. +2 −7 { → proxy}/network_proxy_test.go
  117. +29 −0 proxy/proxy.go
  118. +93 −0 proxy/tcp_proxy.go
  119. +1 −115 network_proxy.go → proxy/udp_proxy.go
  120. +3 −2 registry/registry.go
  121. +186 −52 runtime.go
  122. +369 −66 runtime_test.go
  123. +161 −58 server.go
  124. +22 −25 server_test.go
  125. +47 −0 sorter.go
  126. +36 −0 sorter_test.go
  127. +5 −5 state.go
  128. +17 −6 { → sysinit}/sysinit.go
  129. +153 −20 utils.go
  130. +44 −0 utils/signal_darwin.go
  131. +47 −0 utils/signal_linux.go
  132. +113 −9 utils/utils.go
  133. +28 −5 utils/utils_test.go
  134. +162 −50 utils_test.go
  135. +404 −0 vendor/src/code.google.com/p/gosqlite/sqlite/sqlite.go
  136. +498 −0 vendor/src/code.google.com/p/gosqlite/sqlite3/driver.go
  137. +1 −1 z_final_test.go
View
@@ -17,3 +17,4 @@ docs/_templates
bundles/
.hg/
.git/
vendor/pkg/
View
@@ -185,4 +185,5 @@ Vladimir Kirillov <proger@wilab.org.ua>
Walter Stanish <walter@pratyeka.org>
Wes Morgan <cap10morgan@gmail.com>
Will Dietz <w@wdtz.org>
Yang Bai <hamo.by@gmail.com>
Zaiste! <oh@zaiste.net>
View
@@ -1,5 +1,38 @@
# Changelog
## 0.6.5 (2013-10-29)
+ Runtime: Host Integration
+ Runtime: Container Links and Container Naming
* Documentation: Fixes the flags for nc in example
* Testing: Removes \n from debugf calls
- Client: Only pass stdin to hijack when needed
* Testing: Remove warnings and prevent some mount issues
* Documentation: Linkify @github references in the infrastructure README.md
* Client: Use less reflection in command-line method invocation
- Runtime: Ignore ErrClosedPipe for stdin in Container.Attach
- Client: Change logic for tty resize to avoid warning in tests
- Client: Monitor the tty after starting the container
- Hack: Fix install.sh with $sh_c to get sudo/su for modprobe
- Client: Remove useless os.Exit() after log.Fatalf
* Hack: Update all the mkimage scripts to use --numeric-owner as a tar argument
* Hack: Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
+ Hack: Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
- Runtime: Fix wrong untag while docker rmi
- Runtime: Remove unused field kernelVersion
* Hack: Add -p option to invoke debootstrap with http_proxy
* Client: Improve docker inspect
- Builder: Fix race condition in docker build with verbose + cleanup hostIntegration debug
- Registry: Fix content-type for PushImageJSONIndex
* Runtime: Fixes issues with mounting subdirectories of /mnt in container.
* Runtime: Check return value of syscall.Chdir when changing working directory
- Contrib: Set commentstring in Vim syntax plugin
- Client: Place 'top' subcommand's help in proper order.
* Hack: Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
* Builder: Clean up build warnings. Remove redundant files.
- Testing: Cleanup the test suite
* Hack: Make mkimage-arch.sh a little more clear
* Documentation: Try a different presentation of infrastructure documentation.
## 0.6.4 (2013-10-16)
- Runtime: Add cleanup of container when Start() fails
- Testing: Catch errClosing error when TCP and UDP proxies are terminated
View
@@ -33,15 +33,13 @@ run apt-get update
run apt-get install -y -q curl
run apt-get install -y -q git
run apt-get install -y -q mercurial
run apt-get install -y -q build-essential
run apt-get install -y -q build-essential libsqlite3-dev
# Install Go from source (for eventual cross-compiling)
env CGO_ENABLED 0
run curl -s https://go.googlecode.com/files/go1.1.2.src.tar.gz | tar -v -C / -xz && mv /go /goroot
run cd /goroot/src && ./make.bash
env GOROOT /goroot
env PATH $PATH:/goroot/bin
# Install Go
run curl -s https://go.googlecode.com/files/go1.2rc2.src.tar.gz | tar -v -C /usr/local -xz
env PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
run cd /usr/local/go/src && ./make.bash && go install -ldflags '-w -linkmode external -extldflags "-static -Wl,--unresolved-symbols=ignore-in-shared-libs"' -tags netgo -a std
# Ubuntu stuff
run apt-get install -y -q ruby1.9.3 rubygems libffi-dev
View
@@ -1 +1 @@
0.6.4
0.6.5
View
53 api.go
@@ -42,6 +42,9 @@ func hijackServer(w http.ResponseWriter) (io.ReadCloser, io.Writer, error) {
//If we don't do this, POST method without Content-type (even with empty body) will fail
func parseForm(r *http.Request) error {
if r == nil {
return nil
}
if err := r.ParseForm(); err != nil && !strings.HasPrefix(err.Error(), "mime:") {
return err
}
@@ -69,12 +72,12 @@ func httpError(w http.ResponseWriter, err error) {
statusCode = http.StatusUnauthorized
} else if strings.Contains(err.Error(), "hasn't been activated") {
statusCode = http.StatusForbidden
}
}
if err != nil {
utils.Errorf("HTTP Error: statusCode=%d %s", statusCode, err.Error())
http.Error(w, err.Error(), statusCode)
}
http.Error(w, err.Error(), statusCode)
}
}
func writeJSON(w http.ResponseWriter, code int, v interface{}) error {
@@ -135,8 +138,23 @@ func postContainersKill(srv *Server, version float64, w http.ResponseWriter, r *
if vars == nil {
return fmt.Errorf("Missing parameter")
}
if err := parseForm(r); err != nil {
return err
}
name := vars["name"]
if err := srv.ContainerKill(name); err != nil {
signal := 0
if r != nil {
s := r.Form.Get("signal")
if s != "" {
if s, err := strconv.Atoi(s); err != nil {
return err
} else {
signal = s
}
}
}
if err := srv.ContainerKill(name, signal); err != nil {
return err
}
w.WriteHeader(http.StatusNoContent)
@@ -503,8 +521,12 @@ func postImagesPush(srv *Server, version float64, w http.ResponseWriter, r *http
}
func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := parseForm(r); err != nil {
return nil
}
config := &Config{}
out := &APIRun{}
name := r.Form.Get("name")
if err := json.NewDecoder(r.Body).Decode(config); err != nil {
return err
@@ -515,16 +537,19 @@ func postContainersCreate(srv *Server, version float64, w http.ResponseWriter, r
return err
}
if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.Dns) == 0 && utils.CheckLocalDns(resolvConf) {
if !config.NetworkDisabled && len(config.Dns) == 0 && len(srv.runtime.config.Dns) == 0 && utils.CheckLocalDns(resolvConf) {
out.Warnings = append(out.Warnings, fmt.Sprintf("Docker detected local DNS server on resolv.conf. Using default external servers: %v", defaultDns))
config.Dns = defaultDns
}
id, err := srv.ContainerCreate(config)
id, warnings, err := srv.ContainerCreate(config, name)
if err != nil {
return err
}
out.ID = id
for _, warning := range warnings {
out.Warnings = append(out.Warnings, warning)
}
if config.Memory > 0 && !srv.runtime.capabilities.MemoryLimit {
log.Println("WARNING: Your kernel does not support memory limit capabilities. Limitation discarded.")
@@ -570,12 +595,17 @@ func deleteContainers(srv *Server, version float64, w http.ResponseWriter, r *ht
return fmt.Errorf("Missing parameter")
}
name := vars["name"]
removeVolume, err := getBoolParam(r.Form.Get("v"))
if err != nil {
return err
}
removeLink, err := getBoolParam(r.Form.Get("link"))
if err != nil {
return err
}
if err := srv.ContainerDestroy(name, removeVolume); err != nil {
if err := srv.ContainerDestroy(name, removeVolume, removeLink); err != nil {
return err
}
w.WriteHeader(http.StatusNoContent)
@@ -622,6 +652,10 @@ func postContainersStart(srv *Server, version float64, w http.ResponseWriter, r
return fmt.Errorf("Missing parameter")
}
name := vars["name"]
// Register any links from the host config before starting the container
if err := srv.RegisterLinks(name, hostConfig); err != nil {
return err
}
if err := srv.ContainerStart(name, hostConfig); err != nil {
return err
}
@@ -655,6 +689,7 @@ func postContainersWait(srv *Server, version float64, w http.ResponseWriter, r *
return fmt.Errorf("Missing parameter")
}
name := vars["name"]
status, err := srv.ContainerWait(name)
if err != nil {
return err
@@ -975,7 +1010,7 @@ func makeHttpHandler(srv *Server, logging bool, localMethod string, localRoute s
if err != nil {
version = APIVERSION
}
if srv.enableCors {
if srv.runtime.config.EnableCors {
writeCorsHeaders(w, r)
}
View
@@ -1,7 +1,5 @@
package docker
import "encoding/json"
type APIHistory struct {
ID string `json:"Id"`
Tags []string `json:",omitempty"`
@@ -52,17 +50,18 @@ type APIContainers struct {
Ports []APIPort
SizeRw int64
SizeRootFs int64
Names []string
}
func (self *APIContainers) ToLegacy() APIContainersOld {
return APIContainersOld{
ID: self.ID,
Image: self.Image,
Command: self.Command,
Created: self.Created,
Status: self.Status,
Ports: displayablePorts(self.Ports),
SizeRw: self.SizeRw,
ID: self.ID,
Image: self.Image,
Command: self.Command,
Created: self.Created,
Status: self.Status,
Ports: displayablePorts(self.Ports),
SizeRw: self.SizeRw,
SizeRootFs: self.SizeRootFs,
}
}
@@ -96,14 +95,7 @@ type APIPort struct {
PrivatePort int64
PublicPort int64
Type string
}
func (port *APIPort) MarshalJSON() ([]byte, error) {
return json.Marshal(map[string]interface{}{
"PrivatePort": port.PrivatePort,
"PublicPort": port.PublicPort,
"Type": port.Type,
})
IP string
}
type APIVersion struct {
Oops, something went wrong.

Showing you all comments on commits in this comparison.

@tobstarr

This comment has been minimized.

Show comment
Hide comment
@tobstarr

tobstarr Nov 14, 2013

Contributor

Is that really necessary in the base package? This breaks cross compilation of the docker root package when being used as a library.

Contributor

tobstarr commented on 7c08aee Nov 14, 2013

Is that really necessary in the base package? This breaks cross compilation of the docker root package when being used as a library.

@fsouza

This comment has been minimized.

Show comment
Hide comment
@fsouza

fsouza Nov 14, 2013

Contributor

Yes, it is. This import registers the sqlite3 driver, see line 606.

Contributor

fsouza commented on 7c08aee Nov 14, 2013

Yes, it is. This import registers the sqlite3 driver, see line 606.

@arthurlogilab

This comment has been minimized.

Show comment
Hide comment
@arthurlogilab

arthurlogilab Jul 13, 2016

Am interested in this functionality, can be of any help to get this patch integrated ?

arthurlogilab commented on bc8a108 Jul 13, 2016

Am interested in this functionality, can be of any help to get this patch integrated ?