37bc41c2c0
Merge pull request #1389 from dotcloud/1373-improve_checklocaldns
...
Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 030cc8d5cc2df5a8f8f6acb3724c1e6016363d95
Component: engine
2013-08-05 02:29:36 -07:00
6b62e3168d
Merge pull request #1298 from crosbymichael/1246-auth-request
...
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
2013-08-02 17:39:54 -07:00
3029f070e6
Return JSONError for HTTPResponse error
...
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
71b5dff299
Consider empty /etc/resolv.conf as local dns + add unit test
...
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
7aa4663949
Return registy status code in error
...
Added Details map to the JSONMessage
Upstream-commit: 3043c2641990d94298c6377b7ef14709263a4709
Component: engine
2013-07-30 23:24:31 +00:00
c7d245ec6d
Add check that the request is good
...
Upstream-commit: e4752c8c1a09fc3cc96dbb9be7183b271db3d6b7
Component: engine
2013-07-30 16:42:32 +00:00
ccc9b252b2
Merge branch 'master' into add_last_version-feature
...
Upstream-commit: 99c27fa0ddf6db7eb8a1b9484ea6ad19c0b2e4f5
Component: engine
2013-07-30 16:23:06 +00:00
7c51899dd5
Fixes 1136; Reopened from 1175 with latest changes.
...
Upstream-commit: d86898b0142f2f9a834aa0c727b10d62ef647262
Component: engine
2013-07-25 19:45:49 +00:00
fd89a1c59f
add timestamp and change untagged -> untag
...
Upstream-commit: b8d52ec2669332988a972bff3b5f5d2e9d526b33
Component: engine
2013-07-23 15:41:19 +00:00
d1efb7843b
basic version of the /events endpoint
...
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
c5cd9cfc76
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
Upstream-commit: 0bd534adcf0933d19540506f790d00d8d1cb23d4
Component: engine
2013-07-19 06:43:29 -07:00
0089cd0195
Merge branch 'master' into add_last_version-feature
...
Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414
Component: engine
2013-07-18 20:51:31 +00:00
ff7fe2dacd
Merge pull request #1096 from dotcloud/remove_os_user
...
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: 454cd147fb6133319ecdcda962b6aa137f28f32a
Component: engine
2013-07-15 10:19:09 -07:00
08204dd54e
Add unit test to check wrong uid case
...
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
2013-07-15 10:05:09 -07:00
80066854b8
store both logs in a same file, as JSON
...
Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b
Component: engine
2013-07-15 16:17:58 +00:00
cb4f99ad54
Merge branch 'master' into new_logs
...
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
2013-07-15 13:57:54 +00:00
51c31b8a66
*Client: Fix the progressbar, without manipulating other outputs
...
Prior this commit, 'docker images' and other cmd's, which used utils.HumanSize(),
showed unnecessary whitespaces.
Formatting of progress has been moved to FormatProgess(), justifing the string
directly in the template.
Upstream-commit: bac5772312d1fe733511febd117e9f29ff19c698
Component: engine
2013-07-12 20:15:25 +02:00
23db3e215b
Revert "Client: better progressbar output"
...
This reverts commit 3ac68f1966222d9a1c0ff867515e3f5c2f83e422.
Upstream-commit: a6e5a397bd6b7967a91f1d7cbe581e46211964da
Component: engine
2013-07-12 20:08:45 +02:00
014efc77a7
Remove the os.user dependency and manually lookup /etc/passwd instead
...
Upstream-commit: eb38750d99d4f9706cb2abcb861c84e1d309bd40
Component: engine
2013-07-12 10:49:47 -07:00
18c42253ef
use http://get.docker.io/latest
...
Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753
Component: engine
2013-07-12 11:45:40 +00:00
750c01d0af
wip
...
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
2013-07-11 17:18:28 +00:00
13a18e3d5d
Moved parseRepositoryTag to the utils package
...
Upstream-commit: 019324015b0c64733ae4f39708aa49a08134cb48
Component: engine
2013-07-09 08:06:10 -07:00
36eac88873
Simplify the NopWriter code.
...
Upstream-commit: 27ee261e6048c6fa0334bcce2116610dcd04aaed
Component: engine
2013-07-03 14:35:18 -07:00
2394c9c8dc
add last version
...
Upstream-commit: 64450ae3f89b8f9b5288224c5a7d109a166cf22a
Component: engine
2013-07-03 17:11:00 +00:00
8f5746f4d9
Mutex style change.
...
For structs protected by a single mutex, embed the mutex for more
concise usage.
Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
2be0a9146e
Resolve conflict
...
Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3
Component: engine
2013-06-28 12:32:41 -07: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
c26a152aeb
remove + from minor kernel version
...
Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d
Component: engine
2013-06-27 17:51:17 +03:00
d68f44e101
following 'go vet' in utils pkg.
...
Upstream-commit: 6cf493bea74e9caa05e1da9e970c47d1f24268d8
Component: engine
2013-06-27 01:40:13 -03:00
f6e7db58bd
update progressbar every MIN(1%, 512kB)
...
Upstream-commit: bccf06c748c8f62a617a94e8120ce33f2e53183b
Component: engine
2013-06-25 14:03:15 +00:00
9d597b11de
Merge pull request #848 from dotcloud/builder_server-3
...
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
965a3d343a
Merge pull request #970 from titanous/go1.1-unreachable
...
Remove code unreachable using Go 1.1
Upstream-commit: 63e8a4ac7441ac4af5ca8fdf05f44e9a8a7fc623
Component: engine
2013-06-21 10:44:40 -07:00
f0b6132493
Client: better progressbar output
...
Upstream-commit: 3ac68f1966222d9a1c0ff867515e3f5c2f83e422
Component: engine
2013-06-21 17:19:27 +02:00
7c517d635a
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
...
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
9cf4a66364
Remove code unreachable using Go 1.1
...
Upstream-commit: 50b70eeb6830040db73c8b2b389d881a3200de8d
Component: engine
2013-06-20 23:19:44 -04:00
a4e9bba7a3
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
a1d1477844
Merge pull request #938 from dotcloud/add_unix_socket-feature
...
* Runtime: Add unix socket and multiple -H
Upstream-commit: fa68fe6ff3315757c1be60a3daf73f375974ddb5
Component: engine
2013-06-20 11:17:16 -07:00
9587bb386c
Merge branch 'master' into builder_server-3
...
Conflicts:
docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine
2013-06-20 10:27:12 -07:00
1644bb786c
Merge pull request #849 from dotcloud/improve_progressbar_pull
...
* Client: HumanReadable ProgressBar sizes in pull
Upstream-commit: ec3c89e57c3e91fabb9b084a2762faa20ca720ec
Component: engine
2013-06-19 08:02:40 -07:00
cbe318e165
add the possibility to use multiple -H
...
Upstream-commit: dede1585ee00f957e153691c464aab293c2dc469
Component: engine
2013-06-19 12:31:54 +00:00
11334d506a
add basic support for unix sockets
...
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00:00
0b3b002cd4
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile_test.go
Upstream-commit: 555552340dd07eb446e54011071a621430fd83a0
Component: engine
2013-06-17 14:01:32 -07:00
726da1690f
Merge branch 'master' into builder_server-3
...
Conflicts:
utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -07:00
2105eec29d
+ Builder: ADD of a local file will detect tar archives and unpack them
...
into the container instead of copying them as a regular file.
* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
This is more consistent, reduces the number of dependencies, and
fixe #896 .
Upstream-commit: 5b8287617de65d4e14ed6affb0eb46867e9ee617
Component: engine
2013-06-14 16:43:39 -07:00
e983ca691c
Fix merge issue
...
Upstream-commit: 76a568fc9717ff69999ab54fba9277a0d31c305d
Component: engine
2013-06-14 16:08:08 -07:00
54b69da177
Merge branch 'dns_server_side'
...
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
2013-06-14 14:39:05 -07:00
539c6ff974
Merge branch 'master' into improve_progressbar_pull
...
Upstream-commit: 60fd7d686dea6645ab61c27d0132d38c07a89e80
Component: engine
2013-06-14 12:01:40 -07:00
7376a26c06
Make the progressbar human readable
...
Upstream-commit: 1e0738f63f55d489d3d96274f312c93cc5d69ffa
Component: engine
2013-06-06 18:42:52 -07:00
7b79f826ad
Move the docker build URL form client to server, prepare for GIT support
...
Upstream-commit: a11e61677c7b368628975e2a0ead639b5bfcabb9
Component: engine
2013-06-06 16:09:46 -07:00
9ad1867af2
Move isUrl to utils.IsURL
...
Upstream-commit: f4a4cfd2cc748859d4f28b90274c81098afa8d5d
Component: engine
2013-06-06 15:50:09 -07:00
