3635092ee9
Rolled back of previous commit (skip cert verification)
...
Upstream-commit: 50075106b658ab4dc82d5361e4786f7d28cc570a
Component: engine
2013-06-28 18:19:58 +02:00
a944a8deb6
Ignore 'registry not found' when pushing on independent registries
...
Upstream-commit: 2a1f8f6fda55a5fa2132dbad374043e9fbf6d9f6
Component: engine
2013-06-28 18:19:58 +02:00
6af1e08d14
Skip certificate check (don't error out on self-signed certs)
...
Upstream-commit: 1c817913eee7d87badc2a2748447729619d8aaf0
Component: engine
2013-06-28 18:19:58 +02:00
1f3a1ee5ca
Tentative support for independent registries
...
Upstream-commit: de0a48bd6ff2acfb2ab546a1e718185872eea2c3
Component: engine
2013-06-28 18:19:58 +02:00
5783230d1b
Add doc
...
Upstream-commit: 8589fd6db8d52f93ba64a0d72c6eebe8d50530f6
Component: engine
2013-06-28 18:05:41 +02:00
6657ec16bd
add /proc to list running processes inside a container
...
Upstream-commit: 2e79719622964eb95eca70372ced0ad6e4dce4f5
Component: engine
2013-06-28 15:51:58 +00:00
865986c53d
do not merge hostname from image
...
Upstream-commit: 9bfec5a5389207cba4cdbdd7eafc692c65278ce0
Component: engine
2013-06-28 15:22:01 +02:00
ad4f82e6d2
Merge pull request #1032 from andrewsmedina/govet
...
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
26d95fb135
Merge pull request #1028 from dhrp/bugfixes-on-docs
...
Bugfixes on documentation code
Upstream-commit: e12a204bccfc65b31a484944beb3d61aabe2d362
Component: engine
2013-06-27 19:01:13 -07:00
e4d371fd60
Always return the correct test image.
...
And not a *random* one from its history.
Upstream-commit: fe014a8e6cfe4d2a338736e4c685bcf1b7685200
Component: engine
2013-06-27 18:01:20 -07:00
09791158d7
Fix a nil dereference in buildfile_test.go
...
The test runtime object wasn't properly initialized.
Upstream-commit: aa8ea84d11ccac8f68fa1b0337633dd7d49a44fe
Component: engine
2013-06-27 18:01:10 -07:00
5063918d95
URL schemes of both Registry and Index are now consistent
...
Upstream-commit: 3175e56ad03cbe0118c0982606c5eba9e34c1b07
Component: engine
2013-06-27 17:55:17 -07:00
65b2fd1698
Ignore stderr while doing tests
...
Upstream-commit: 800d9006883228365a375800254871397cb1a011
Component: engine
2013-06-27 15:25:31 -07:00
2afee8496c
Merge pull request #1035 from dotcloud/fix_panic_cast
...
- Runtime: fix panic with unix socket
Upstream-commit: 1a201d243327280e06e43ea538eb52a0c878cc57
Component: engine
2013-06-27 15:22:18 -07:00
f7d1250f60
Merge pull request #1041 from unclejack/fix_minor_kernel_version_for_git_kernels
...
remove + from minor kernel version for kernels built from git
Upstream-commit: 750c94efbbe6ab230670d5a1bb1329979bc0fb93
Component: engine
2013-06-27 15:21:34 -07:00
13ee8793a9
Make sure the ID is displayed usgin run -d
...
Upstream-commit: bd144a64f652895a41b67464a426839ef79d73dc
Component: engine
2013-06-27 12:48:25 -07:00
d68905c249
Improve last log output
...
Upstream-commit: 2a20e852032339b4c91a01748119701c7ada234d
Component: engine
2013-06-27 11:10:19 -07:00
c26a152aeb
remove + from minor kernel version
...
Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d
Component: engine
2013-06-27 17:51:17 +03:00
77a309a0df
fix panic with unix socket
...
Upstream-commit: 9d3ec7b39fcf178eaa9aa1482f0a85c257df4408
Component: engine
2013-06-27 12:57:19 +00:00
edf5c211e8
Merge pull request #1019 from dotcloud/1002-change_update_progress_bar_rate-feature
...
*Remote API: update progressbar every MIN(1%, 512kB)
Upstream-commit: e68a23bdc1a92f5b9bb4d3fa3e495330068a7e9a
Component: engine
2013-06-27 04:19:42 -07:00
d68f44e101
following 'go vet' in utils pkg.
...
Upstream-commit: 6cf493bea74e9caa05e1da9e970c47d1f24268d8
Component: engine
2013-06-27 01:40:13 -03:00
e593de79dc
following the 'go vet' suggestions.
...
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
9060c46513
Merge pull request #1029 from lopter/master
...
* Hack: add a script to create the docker-ut image (busybox + socat)
Upstream-commit: c4a44f6f0be9d24f53dc7643ebeeb00d2e1a92be
Component: engine
2013-06-26 16:28:58 -07:00
f2f4f1b439
Merge pull request #602 from gabrtv/111-bind-mounts
...
+ Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 3e29695c1fe83e9c2cc3132735e88a1f0ec62fce
Component: engine
2013-06-26 15:59:35 -07:00
b1ef39bb79
- Runtime: small bugfixes in external mount-bind integration
...
Upstream-commit: 46a9f29baef77dbe212e1261f5cecbe1b53fadb9
Component: engine
2013-06-26 15:26:47 -07:00
5327febeeb
- Fix a few bugs in external mount-bind integration
...
Upstream-commit: 67239957c9e863f16a6d147d88dd2fae00c3770f
Component: engine
2013-06-26 15:10:38 -07:00
1c5ea40b1c
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
...
Upstream-commit: d4e62101abca637b5bc057ec13e73d9ce65d6161
Component: engine
2013-06-26 15:08:07 -07:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
7b52085a24
Merge pull request #1005 from dotcloud/1004-stdin_piping-fix
...
- Runtime: Fix issue when attaching stdin alone
Upstream-commit: cd0f22ef72da22adaae68b93f4e4e65ed70edc2b
Component: engine
2013-06-26 12:56:14 -07:00
167474d709
Display containers logs in case of build failure
...
Upstream-commit: 27d67773768222ffc57f124b38c767f36a575f96
Component: engine
2013-06-26 12:50:20 -07:00
09b324ca87
Add a script to create the docker-ut image
...
It's a fork of the mkimage-busybox.sh script and it adds socat to the
image. (socat being needed to add udp support, see #33 ).
This script, like mkimage-busybox.sh, probably only works on
Debian/Ubuntu.
Upstream-commit: e5c0b3110703258e255305cd9feb114a02c33350
Component: engine
2013-06-26 12:35:14 -07:00
ec62c0223f
Merge pull request #1021 from errnoh/fix-test-filled-tmpfs
...
TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero....
Upstream-commit: 5cdbd2ed7ab1a09245851443ec7d08d4a2dfd680
Component: engine
2013-06-26 11:59:06 -07:00
4b6fc4d9a0
Merge pull request #1010 from dotcloud/1009-testing-hack
...
Testing|hack, issue #1009 : Update make hack environment
Upstream-commit: b44e2e71aa80246d5ef0f18e95f873c53d13edf5
Component: engine
2013-06-25 17:07:18 -07:00
e0c6d66dac
Bugfixes on docs
...
* fixed canonical link from index
* added http redirect from builder/basics
* fixed url in redirect_home
Upstream-commit: 73afc6311daf6bce10d081352aa1efbfcb406d10
Component: engine
2013-06-25 15:31:22 -07:00
c81eba049a
Add missing fprintf instead of printf
...
Upstream-commit: 6127d757a7495df83b3d4cec53dc56b48c764023
Component: engine
2013-06-25 10:39:11 -07:00
e56adbd4e1
TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero. fixes #737
...
Upstream-commit: fb86dcfb17444089aea31cdf6c9b09c4421731c7
Component: engine
2013-06-25 17:52:10 +03:00
f6e7db58bd
update progressbar every MIN(1%, 512kB)
...
Upstream-commit: bccf06c748c8f62a617a94e8120ce33f2e53183b
Component: engine
2013-06-25 14:03:15 +00:00
d9bf1bf281
Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
...
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
2013-06-25 13:33:45 +00:00
796f945ca5
Merge pull request #1018 from nahiluhmot/add-swipely-docker-gem
...
* Documentation: Added Swipely's `docker-api` gem to the table of Remote API Client Libraries.
Upstream-commit: e1e2ff52fee8d36ae46c014d27928f967205c17d
Component: engine
2013-06-25 05:49:52 -07:00
b1a130438c
Added Swipely's docker-api gem to the table of Remote API Client
...
Libraries.
Upstream-commit: d03edf12e4ad67f0900434af5c8d36688b6cc2a4
Component: engine
2013-06-25 08:26:41 -04:00
3bc1ecc1fa
Merge pull request #992 from unclejack/use_numeric_owner_for_tar
...
* Runtime: use --numeric-owner for Tar and Untar
Upstream-commit: ec1dfc521ce9aa78f7635932708c798f87aa9374
Component: engine
2013-06-24 18:40:43 -07:00
51f8e07a39
Implement regression test for stdin attach
...
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
2013-06-24 18:36:04 -07:00
38132ab186
Make NewDockerCli handle terminal
...
Upstream-commit: 873a5aa8e72102a31f34c62603a3f5976471e94a
Component: engine
2013-06-24 18:29:08 -07:00
9e3102fd11
Make term function consistent with each other
...
Upstream-commit: 672d3a6c6cd0494a0b8eaa13674c3cb87cba029c
Component: engine
2013-06-24 18:27:57 -07:00
40e51bbd8c
Make DockerCli use its own stdin/out/err instead of the os.Std*
...
Upstream-commit: a749fb21309b147a1bb9da0838f591ba58f6d169
Component: engine
2013-06-24 18:27:57 -07:00
1553a048ac
Fix issue when attaching stdin alone
...
Upstream-commit: 25d1bc2c09e3f6e7973d6b159e49ae7f8bd7670d
Component: engine
2013-06-24 18:27:57 -07:00
4d3023b64d
Testing|hack, issue #1009 : Update make kack environment
...
Upstream-commit: cc63c1b584a06a41482bf967908bab10853799f6
Component: engine
2013-06-24 15:01:51 -07:00
00aa741c14
Merge pull request #990 from dotcloud/fix-tests-cgo
...
* Hack: remove dependency of unit tests on 'os/user', which cannot be used with CGO_ENABLED=0
Upstream-commit: 145c622aba863ba64aa405c21cd21386189846b7
Component: engine
2013-06-24 12:31:54 -07:00
30b4c0d126
Merge pull request #932 from metalivedev/docs20130614
...
+ Documentation: Add terminology section
Upstream-commit: e2516c01b46ec41dc5dc3bce09f1e35fe3f7277b
Component: engine
2013-06-24 10:39:25 -07:00
4770325fb2
Merge pull request #1003 from dotcloud/fix_utils_tests
...
fix regression in utils tests introduced by #980
Upstream-commit: a3cb18d0f058df47fd4822508a53c0bb7d1af3d4
Component: engine
2013-06-24 09:14:13 -07:00
