c26a152aeb
remove + from minor kernel version
...
Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d
Component: engine
2013-06-27 17:51:17 +03:00
f6e7db58bd
update progressbar every MIN(1%, 512kB)
...
Upstream-commit: bccf06c748c8f62a617a94e8120ce33f2e53183b
Component: engine
2013-06-25 14:03:15 +00:00
ab69a9cf4c
fix regrettion in utils tests introduced by #980
...
Upstream-commit: eca9f9c1a1e436167eb660ad700f3f9f5189bae4
Component: engine
2013-06-24 16:12:39 +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
8ec498cc12
add tests
...
Upstream-commit: 9632bf228744dddfae2c303a0f2e8b962b6e0673
Component: engine
2013-06-19 12:40:01 +00: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
0828523946
Check for local dns server and output a warning
...
Upstream-commit: a3f6054f974909458c9e820842310987e225b767
Component: engine
2013-06-06 11:01:09 -07:00
72a9843fea
Add -dns to docker daemon
...
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
fafb25034a
bump to master again
...
Upstream-commit: bf63cb904592e1ca73aa3990c08ea0b752fec14d
Component: engine
2013-06-05 16:01:36 +00:00
e1f455fc5a
bump to master
...
Upstream-commit: b4682e6707301b650f041b877db0ea0053a9b340
Component: engine
2013-06-05 10:19:51 +00:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
0b2167b3b8
fix progress message in client
...
Upstream-commit: 3922691fb99a99cec0a5d239da522cc3d8778e6c
Component: engine
2013-06-04 16:09:08 +00:00
9c0086fb7d
drop/omit
...
Upstream-commit: 86ada2fa5d00820288df8a59eca3deef83f4aeb6
Component: engine
2013-06-04 13:51:12 +00:00
a42c91a1f7
bump to master
...
Upstream-commit: 3afdd82e426c70c919d902eec5ec50d488c837fa
Component: engine
2013-05-30 23:38:40 +00:00
167d529e1c
ensure progress downloader is well formated
...
Upstream-commit: cd002a4d162aa273cd9e646e6fd124ef2b6f6944
Component: engine
2013-05-30 17:00:42 +00:00
06534c45f7
bump to master
...
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
4fefd78435
Add directory contents instead of while directory for docker build
...
Upstream-commit: 2897cb04760d7e4e7e52ccc20e94c94e3743667e
Component: engine
2013-05-28 15:22:01 -07:00
d21f15c6b9
Merge master
...
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
2013-05-28 13:42:50 -07:00
dda3557a3e
Implement the CmdAdd instruction
...
Upstream-commit: 6ae3800151025ff73a97c40af578ee714164003b
Component: engine
2013-05-28 13:38:26 -07:00
037b9b6160
fix json encoding, and use less casts
...
Upstream-commit: 5a36efb61fae88a7fe71f67a6b1f8b9da6468014
Component: engine
2013-05-26 23:45:45 +00:00
b088e2de70
ensure valid json
...
Upstream-commit: 14212930e40439d0cfc635d56e084736867f9e30
Component: engine
2013-05-25 15:51:26 +00:00
04ca200a24
imporved error, push, import insert
...
Upstream-commit: c8c7094b2e8088210e2182e582264e09222c6e3d
Component: engine
2013-05-25 15:09:46 +00:00
7a922259e1
add error handling
...
Upstream-commit: cb0bc4adc297baeea8e7b74269765c35457e04e7
Component: engine
2013-05-25 14:12:02 +00:00
10117596bb
first version of Pull
...
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
4904dcf8ba
jsonstream WIP
...
Upstream-commit: cf35e8ed81029a3c2717659eac7979017bb01890
Component: engine
2013-05-23 15:16:35 +00:00
183381f196
switch to SI standard and add test
...
Upstream-commit: b45143da9b275b5003c23667b0988ad93f383b11
Component: engine
2013-05-23 10:29:09 +00:00
87ab4000ad
fix typo
...
Upstream-commit: ed56b6a905d5e9f443cb0c5c949965f848abbe8d
Component: engine
2013-05-23 09:35:20 +00:00
8c3121bf04
bump to master
...
Upstream-commit: 6fce89e60b71ee2306d66003697b6c746c456250
Component: engine
2013-05-22 13:41:29 +00:00
4582eb4daf
Merge pull request #625 from dotcloud/remove-hijack
...
Remove hijack from api when not necessary
Upstream-commit: bebbbf914b241448c6304c915c708f7cbc582c06
Component: engine
2013-05-20 11:27:07 -07:00
a82b37a1d2
Avoid cast each write for flusher
...
Upstream-commit: ae9d7a5167da58de9a1a4beac489cf1e6adcea11
Component: engine
2013-05-20 10:58:35 -07:00
543cef1b6d
fix compilation on linux
...
Upstream-commit: 1b007828c93bc472af3306b8da1d72a84b484f12
Component: engine
2013-05-20 20:43:09 +03:00
73460590ba
Make the printflfush an interface
...
Upstream-commit: 98b0fd173b7b59316d776534b84ecc9ab0a1da77
Component: engine
2013-05-20 10:22:50 -07:00
