Commit Graph

593 Commits

Author SHA1 Message Date
efc88e6663 Add rm option to docker build to remove intermediate containers
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
108dc7f51c Merge pull request #1796 from shin-/api_1_5
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information 
Upstream-commit: 2801624462a4b3842930d38b09a5039629d1a5d3
Component: engine
2013-09-09 16:58:54 -07:00
fb9071f221 only os.Exits on error
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
2013-09-09 21:26:35 +00:00
887e5a84ef Merge pull request #1812 from dotcloud/return-run-exit-code
*Client: Return the process exit code for run commands
Upstream-commit: 9b088ada7e1f7bf9021d6c319550ff11be1b0a22
Component: engine
2013-09-09 14:10:46 -07:00
d2ed0c7fa0 Return the process exit code for run commands
Upstream-commit: 3bc73fa21e4428cd7040df6c5a384bd0e4772236
Component: engine
2013-09-05 23:54:03 +00:00
e904047138 Detect images/containers conflicts in docker inspect
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
2013-09-05 22:31:17 +00:00
b1857983d6 Merge branch 'mhennings-1357-implement-login-with-private-registry' into api_1_5
Upstream-commit: 98a1314251cf5d0ffe0f9d44055e8e73ff368947
Component: engine
2013-09-04 22:27:04 +02:00
89239ee795 Merge branch 'better_api_ports' of git://github.com/shin-/docker into shin--better_api_ports
Upstream-commit: 2ea52dddec97c26bfcb1d9837a1dae0a9974e14c
Component: engine
2013-09-04 22:25:01 +02:00
b3963e7c9f Move auth header on run cmd
Upstream-commit: ded973219e997f52634eb18d0cfe828472412dd8
Component: engine
2013-09-03 20:59:48 +02:00
55601bfa49 Use base64 encoding
Upstream-commit: dd4aab8411ec070baeb14ecc43f683d12b722746
Component: engine
2013-09-03 20:59:48 +02:00
72419917d6 Pass auth config through headers rather than as URL param
Upstream-commit: d04beb7f4315c6b659958227954398437a69e5d6
Component: engine
2013-09-03 20:59:48 +02:00
42b37ac06c Send corrent endpoint authentication when an image is pulled during the run
cmd.
Upstream-commit: ad322d7cca4857292d41e164058382f83a06cf98
Component: engine
2013-09-03 20:59:48 +02:00
9762bbddd8 Move authConfig to a Parameter on postImagePush, too
Upstream-commit: da3bb9a7c6ad79f224ee91a2dd053c1e1b2ad053
Component: engine
2013-09-03 20:59:48 +02:00
e60a2a9f3c Login against private registry
To improve the use of docker with a private registry the login
command is extended with a parameter for the server address.

While implementing i noticed that two problems hindered authentication to a
private registry:

1. the resolve of the authentication did not match during push
   because the looked up key was for example localhost:8080 but
   the stored one would have been https://localhost:8080

   Besides The lookup needs to still work if the https->http fallback
   is used

2. During pull of an image no authentication is sent, which
   means all repositories are expected to be private.

These points are fixed now. The changes are implemented in
a way to be compatible to existing behavior both in the
API as also with the private registry.

Update:

- login does not require the full url any more, you can login
  to the repository prefix:

  example:
  docker logon localhost:8080

Fixed corner corner cases:

- When login is done during pull and push the registry endpoint is used and
  not the central index

- When Remote sends a 401 during pull, it is now correctly delegating to
  CmdLogin

- After a Login is done pull and push are using the newly entered login data,
  and not the previous ones. This one seems to be also broken in master, too.

- Auth config is now transfered in a parameter instead of the body when
  /images/create is called.
Upstream-commit: fcee6056dc50de7698772a3049cdfa1eb0f2416f
Component: engine
2013-09-03 20:45:49 +02:00
2e60ad0f9a Merge pull request #1317 from calavera/login_signal
Exit from `docker login` on SIGTERM and SIGINT.
Upstream-commit: d13c2ed24edf38908400485cba82110361545ffe
Component: engine
2013-09-03 11:16:05 -07:00
a2a878343d Add 2 missing cli commands to docs (events + insert) and alphabetically order docker output
Upstream-commit: 6380b42edbf98dec3b04b3b74fcfbfd63dba4034
Component: engine
2013-09-03 16:35:22 +02:00
9747a3f3df Read the stdin line properly.
Load the auth config before it's used.
Upstream-commit: ce53e21ea6790cf7c2e96f8c5f0725bdf41a80f0
Component: engine
2013-09-01 16:12:07 -07:00
493d150712 Merge branch 'master' into login_signal
* master: (23 commits)
  Made calling changelog before run return empty. Fixes #1705.
  fix error in docker build when param is not a directory
  Document FROM <image>:<tag> Dockerfile instruction.
  Install Ubuntu raring backported kernel from official archives directly.
  Updated "Use -> The Basics" to use ubuntu:12.10.
  hide version when not available
  added a Dockerfile which installs all deps and builds the docs.
  Unable to find image error should print to stderr
  remove message during tests
  use init function
  add TEST env var during tests and silenced parserun during tests
  Update python_web_app.rst
  Update remaining upstart scripts to wait for lxc-net
  Fixed a minor syntax error.
  Add privileged flag in documentation for container creation
  Fix #1685: Notes on production use. General installation cleanup.
  Fix bash completion, remove have
  added apt-key finger tip and fingerprint in ubuntu installation page
  Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
  Start docker after lxc-net to prevent ip forwarding race
  ...
Upstream-commit: fa3266efa553940b0b4a56f008bbe8634650d5ae
Component: engine
2013-09-01 15:56:59 -07:00
01ba35b8f8 fix error in docker build when param is not a directory
Upstream-commit: d605e82badf64c3033f5f26199285aed414f63dd
Component: engine
2013-08-30 18:08:29 +00:00
f1d90b21c4 Merge pull request #1738 from jonasi/error-to-stderr
Unable to find image error should print to stderr
Upstream-commit: 74982bda32d99e02c0ce9a34371fe0cf6ef1d208
Component: engine
2013-08-30 10:43:45 -07:00
b0c69b2fc0 hide version when not available
Upstream-commit: e3b58d302795fbbfa6c117774906a4c9efd536f4
Component: engine
2013-08-30 00:46:43 +00:00
cb31b917c6 Unable to find image error should print to stderr
Upstream-commit: 4ff649ce852175f209c27d03992f31b5f14cae65
Component: engine
2013-08-29 18:25:11 -05:00
7d1c223c01 Use flag.StringVar to capture the command line flags.
Upstream-commit: 9f8e5a93b4b7c6b190177c73085e7d2d2d93c64b
Component: engine
2013-08-29 11:46:42 -07:00
ea51b25ef3 Simplify term signal handler.
Upstream-commit: b8a89628339dd63b5f2ff3d28715a5431412b65a
Component: engine
2013-08-29 11:46:42 -07:00
13f0cfba56 Print a new line after getting the password from stdin.
Upstream-commit: f18889bf674e574a3ac1315ed7bbd56bf638e6c5
Component: engine
2013-08-29 11:46:41 -07:00
97484172e8 Exit if there is any error reading from stdin.
Upstream-commit: 6e4a818ee65008a043d3ba8e5053cc43babb2f66
Component: engine
2013-08-29 11:46:41 -07:00
1d2e8a4a7e Stop making a raw terminal to ask for registry login credentials.
It only disables echo asking for the password and lets the terminal to handle everything else.
It fixes #1392 since blank spaces are not discarded as they did before.
It also cleans the login code a little bit to improve readability.
Upstream-commit: 2357fecc92c57e2fcd4a37c60d713508210358f7
Component: engine
2013-08-29 11:46:41 -07:00
b37c48f450 Allow to generate signals when termios is in raw mode.
Upstream-commit: 23dc52f52804219bd57b34217d8778bda0444f13
Component: engine
2013-08-29 11:45:04 -07:00
acb802996c Use a more idiomatic syntax to capture the exit.
Upstream-commit: c3154fdf4d15aed049a9c18a36cc8511ed7e82c1
Component: engine
2013-08-29 11:45:03 -07:00
202ce62cc3 Exit from docker login on SIGTERM and SIGINT.
Fixes #1299.
Upstream-commit: f1d0625cf895abd1e6b22db3470216b9b9c5ef29
Component: engine
2013-08-29 11:45:03 -07:00
828c933a0c More descriptive, easier to process container portmappings information in the API
Upstream-commit: 98018df07856811536722df84b9558e0efdabdca
Component: engine
2013-08-28 00:20:35 +02:00
0731b44888 Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
As 'go fmt' doesn't support verifying files in multiple directories,
it's probably a good idea to run it on all '*.go' files from time to
time with something like this:

  find . -name "*.go" | xargs dirname | sort -u | xargs -n 1 echo go fmt
Upstream-commit: d80b50d4b4759665b93e713b99239aba9893416e
Component: engine
2013-08-27 10:05:25 +02:00
d0235d90e7 Merge pull request #1636 from unclejack/1594-return_non_zero_when_encountering_error
1594 - return non-zero exit code if at least one container has failed to start
Upstream-commit: b866254a195e9b33515b8a606185c26652f38a2a
Component: engine
2013-08-26 13:20:31 -07:00
825653cef4 Display error if resource not specified
Display an error message if a container resource is not supplied to
'docker cp'.

Fixes error in #1661
Upstream-commit: d8a18ea3ae96ab415885fc1554db168d94d64265
Component: engine
2013-08-25 00:28:36 +01:00
a66e92affc return error if at least one container fails to start
This makes docker start exit with exit code 1 if at least one container
didn't start. This also prints an error at the end.
Upstream-commit: d1ad0e278d67baad46168f6d04a56550a287d4a7
Component: engine
2013-08-23 20:14:06 +03:00
1354f3a6b5 Merge pull request #1587 from dotcloud/1559_improve_version
Improve version
Upstream-commit: 78a71b1273dbefbe1ce1bb239b739870dbb0fc71
Component: engine
2013-08-22 17:28:18 -07:00
c7a4c41750 Merge pull request #1525 from griff/1503-fix
Don't read from stdout when only attached to stdin
Upstream-commit: f925edd12de4f56bf088175257b26e6234cd0c80
Component: engine
2013-08-22 13:43:05 -07:00
0d89f3a693 Merge pull request #1609 from jpetazzo/release-docker-with-docker
Release docker with docker
Upstream-commit: 12715c8ddc216fa7aeba6d900e43905299e8bf25
Component: engine
2013-08-22 13:13:06 -07:00
db924199de Merge pull request #1565 from dotcloud/only_load_authconfig_when_needed
Load authConfig only when needed and fix useless WARNING
Upstream-commit: 326dadd22441f2bd99e584a9e442c386432525fa
Component: engine
2013-08-22 11:10:16 -07:00
9e0921e842 Merge pull request #1576 from MatthewMueller/patch-1
updated default -H docs
Upstream-commit: e0a7013836e9302a5181f1e78ed6b9310b5eeac6
Component: engine
2013-08-21 09:09:43 -07:00
7440fa2394 update help
Upstream-commit: 215094903a9574953af915f5b93c89858d626473
Component: engine
2013-08-21 02:08:32 -07:00
0bebe41d5e Move VERSION to a dedicated file to facilitate automated builds and releases
Upstream-commit: 9087ef9a770789e6987cd1ca4396d6b20a446724
Component: engine
2013-08-20 19:32:37 -07:00
f0aa1cf20d fix typo
Upstream-commit: 41973d41e950249cd630f193a4d9250e3b3740e5
Component: engine
2013-08-20 11:52:37 +00:00
c2eb20c17f improve version
Upstream-commit: 646afab28d8ccadf81e1d18055335739b6b983d1
Component: engine
2013-08-19 12:07:49 +00:00
03e9994efc Merge pull request #1553 from dotcloud/1540_fix_error_message
fix can't connect message with socket
Upstream-commit: f6653c3fa55dc4e0595fc8d3904bd5873f317441
Component: engine
2013-08-19 05:06:21 -07:00
a4c8dff47f load authConfig only when needed and fix useless WARNING
Upstream-commit: 18962d0ff33cfa6ba2976aa459c766acfd23c1bf
Component: engine
2013-08-19 11:42:38 +00:00
9a03ff28c0 add to cli
Upstream-commit: f409c119168b145157ff5329fd10ad0a8725d341
Component: engine
2013-08-17 22:10:06 -07:00
caadb4bcda Show tag used when image is missing
Upstream-commit: 07a887032af78e5014d635f7e1d669d49b50894d
Component: engine
2013-08-17 20:03:54 -07:00
20b48ace76 fix can't connect message
with socket
Upstream-commit: 62b45f08278ef283b91cc91761a25f5ceca16136
Component: engine
2013-08-15 13:48:08 +00:00
08c2360512 Don't read from stdout in hijack unless attached. Fixes #1503
Upstream-commit: c7cda86e847d541efbc4fc8ce834d924b2b98bf1
Component: engine
2013-08-15 02:54:06 +02:00