08f73695ab
Merge pull request #1089 from dotcloud/multiple_test_images-fix
...
- Tests: Fix unit tests when there is more than one tag within the test image
Upstream-commit: ead9cefadbd19a4a855507bc482ef2464dd8c143
Component: engine
2013-07-01 13:58:04 -07:00
4af6128790
Merge pull request #1086 from crosbymichael/1008-image-entrypoint
...
+ Builder: Add Entrypoint to builder and container config
Upstream-commit: 185a2fc55e64a828d8443b912505283b6f8b97d4
Component: engine
2013-07-01 13:33:12 -07:00
4fd8f2839f
Fix unit tests when there is more than one tag within the test image
...
Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10
Component: engine
2013-07-01 11:45:45 -07:00
9e16e5309d
Issue #1087 Docker Java API client -- added java to Docker Remote API Client document
...
Upstream-commit: aa9bec96b1d3aedcb67e6985ae5754e728665407
Component: engine
2013-07-01 11:28:40 -07:00
2e70c0f0f0
Add Entrypoint to builder and container config
...
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
867f33af50
fix status code in doc
...
Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a
Component: engine
2013-07-01 13:28:58 +00:00
6a579abd18
Merge pull request #1061 from proppy/fix-slices-ref
...
api,server: slice are already refs, no need to return ptr
Upstream-commit: 5e029f760000be547350e520302c5811d85fe525
Component: engine
2013-07-01 04:51:56 -07:00
5b3a7c0583
Documented release process for maintainers in hack/RELEASE.md
...
Upstream-commit: b37f7d49d8af31e52e5105898dcd799c9eae4c98
Component: engine
2013-06-29 22:08:25 -07:00
51b93736d6
* Hack: change builder tests to always use the current unit test image, instead of hardcoding 'docker-ut'
...
Upstream-commit: 273e0d42b7bd56f263d4d2d95fb27a692b875377
Component: engine
2013-06-29 21:22:15 -07:00
4240b58553
Bump version to 0.4.7
...
Upstream-commit: ca497a82abfe92f2dbe1a7e161dc7ff19eefeec4
Component: engine
2013-06-29 21:12:29 -07:00
f44918dcc7
* Hack: move unit tests to a different source image, to work around issues when docker-ut has more than 1 tag.
...
Upstream-commit: b7226316c716daf7648b2dc4de829f866a4377b5
Component: engine
2013-06-28 19:43:55 -07:00
84c3646cd3
Merge pull request #1052 from lopter/master
...
Fix a couple critical bugs on the test suite
Upstream-commit: 84f41954ae1b7aa5d21d2b27b119ad0b4b985627
Component: engine
2013-06-28 17:00:51 -07:00
e3b18af210
api,server: slice are already refs, no need to return ptr
...
Upstream-commit: 54da339b2c3d1fe11a465aff69fc4e00ec3b40fd
Component: engine
2013-06-28 12:41:09 -07:00
ddffbf8c3d
Fixed conflicts
...
Upstream-commit: ac37fcf6f3f28f56b4ad58143891be9b1fe99dec
Component: engine
2013-06-28 12:36:59 -07:00
2be0a9146e
Resolve conflict
...
Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3
Component: engine
2013-06-28 12:32:41 -07:00
d496b27176
Merge pull request #700 from dotcloud/615-pushbyid
...
Allow to push/pull on independent registries (by repository or image ID)
Upstream-commit: 30342efa37877d7f731d974661d18783c442c8d0
Component: engine
2013-06-28 10:29:10 -07:00
8c9ba170e1
Fixed issue in registry.GetRemoteTags
...
Upstream-commit: 72befeef24b3fb0c77f56e3ac2bbfdb4744cbd7a
Component: engine
2013-06-28 18:42:37 +02:00
58057e8372
testing|stabilization, issue 973: Use docker-golang PPA and lts-raring kernel
...
Upstream-commit: af2a92f22b053d7c04a4416da87523d4296e103c
Component: engine
2013-06-28 09:23:25 -07:00
c2894b0393
go fmt pass
...
Upstream-commit: ad2f826a825be2889057a773eff1a2bc605e8e80
Component: engine
2013-06-28 18:19:58 +02:00
0081ddc545
Allow push by ID when using a custom registry
...
Upstream-commit: e095a1572fb8a2ba17ea231abcb3704cf83a96e4
Component: engine
2013-06-28 18:19:58 +02:00
4eec06d217
Several fixes and updates to make this work with latest changes in master
...
Upstream-commit: c3dd6e1926f9359f840a9f7b0be9cfa7fe2cfea2
Component: engine
2013-06-28 18:19:58 +02:00
d5e7a7e8e9
Reenable writeflusher for pull
...
Upstream-commit: 67ecd2cb822894e4d35adea031e5b79d7ca8e91a
Component: engine
2013-06-28 18:19:58 +02:00
01a345c7fb
Remove https prefix from registry
...
Upstream-commit: 57d751c3770194ff867ebace36eb1be7d72d2fe9
Component: engine
2013-06-28 18:19:58 +02:00
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
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
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
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
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
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
