docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
11,081 Commits 12 Branches 296 Tags
207c89062c05fcd25013b43e78eee09f18323960
Commit Graph

11081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shuai-z
207c89062c removed redundant Clean 
The doc (or src) says: The result is Cleaned.

http://golang.org/pkg/path/filepath/#Join

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: 1d1b813d255512002b382b2d2db48984d9b03957
Component: engine
 2014-11-10 17:57:01 +02:00
Alexandr Morozov
c89d81761a Fix deadlock in ps exited filter 
Fixes #8909

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Conflicts:
	integration-cli/docker_cli_ps_test.go
		fixed merge issue caused by missing tests
Upstream-commit: fd9c2ae27dc08114ae1170503217da8d2cb778d6
Component: engine
 2014-11-07 16:35:50 +02:00
unclejack
9db4b04ff4 bump fpm to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 09c38a8d43cb7fcb128861d0a7f32acaee92115c
Component: engine
 2014-11-07 16:18:53 +02:00
Tibor Vass
c336d5845c Merge pull request #8861 from tiborvass/bump_v1.3.1 
Bump v1.3.1
Upstream-commit: 86292adbd982fa782e64289295df9efd4dc18e67
Component: engine
 2014-10-30 12:43:43 -04:00
Tibor Vass
d2356a19a6 Bump to version v1.3.1 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4e9bbfa90054cd730e81b53b2de67a74306afc95
Component: engine
 2014-10-30 09:44:46 -04:00
Tibor Vass
6c00f658a9 Fix login command 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: e6efbd659606386db4d0b83b98f9e189cf42595c
Component: engine
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
9872715c17 builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 9fc8b7f4e1f88d8573118b7300b18379072418d1
Component: engine
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
b3a290d7cc builder: whitelist verbs useful for environment replacement. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 463297ffe9d0b671d3b26e13905855ab3ff85d57
Component: engine
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
25ffa9fb6c builder: handle escapes without swallowing all of them. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 2dac82eb82b469f94ef26a153d2679663b048ad3
Component: engine
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
8329b37b51 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 7f8cdeb18ba14502845efa7e7e90e913d2df23d2
Component: engine
 2014-10-30 09:17:11 -04:00
Tibor Vass
476b59bd0c Docs edits for dropping SSLv3 and under + release notes for 1.3.1 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/index.md
Upstream-commit: 3d287811d78c373a4fd3ef069a9c13cd83b80169
Component: engine
 2014-10-28 10:42:30 -04:00
Erik Hollensbe
fe1373fd5e builder: handle cases where onbuild is not uppercase. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 21ab75afe0f7e92ffe942e30c77651a01b6db223
Component: engine
 2014-10-21 17:08:05 -04:00
Brian Goff
83f3259542 Clean volume paths 
Fixes #8659

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 66fba7c46ed3507166774ec8000ca478907e80a7
Component: engine
 2014-10-20 19:11:44 -04:00
Alexandr Morozov
540f32c0f8 Don't write pull output to stdout on container creating 
Fixes #8632

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ff325bcb2feb501c2287ecb305644b003784f726
Component: engine
 2014-10-20 17:35:43 -04:00
Erik Hollensbe
7634be83d9 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cf23053eb1d88ce7b3ba2ca06f42c408021c93b5
Component: engine
 2014-10-20 16:53:37 -04:00
Daniel, Dao Quang Minh
566c43f442 Avoid fallback to SSL protocols < TLS1.0 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Conflicts:
	registry/registry.go
Upstream-commit: 8caacb18f8019dfda30d79c327397e5f5783c068
Component: engine
 2014-10-20 16:51:06 -04:00
Tianon Gravi
973b80b56f Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 7d9ccc2636af30e45950b27d3f69cacb0ad43f40
Component: engine
 2014-10-20 16:51:06 -04:00
Jessica Frazelle
972cdf2ab6 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: ada9ac7b1300d2c647a17f5f5f274195ef5620b6
Component: engine
 2014-10-20 16:51:06 -04:00
Tibor Vass
8adeb0a650 Do not verify certificate when using --insecure-registry on an HTTPS registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry.go
	registry/registry_test.go
	registry/service.go
	registry/session.go
Upstream-commit: e134f1f74a9d1f9ec55fcd8af8c2dce8e9558618
Component: engine
 2014-10-20 16:51:06 -04:00
Michael Crosby
b4b8037ecd Don't hard code true for auth job 
Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
Upstream-commit: f43e77fc125840f40af52da01cd2a62bca49765e
Component: engine
 2014-10-20 16:51:05 -04:00
Michael Crosby
0184acc7f9 Expand documentation for --insecure-registries 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c66196a9dc0cd7d19eb3535c52fdbccfa2ee628e
Component: engine
 2014-10-20 16:51:05 -04:00
Michael Crosby
62c48d6aec Refactor IsSecure change 
Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.

Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	graph/pull.go
	graph/push.go
	graph/tags.go
Upstream-commit: c0598aced053f7a7e06aebd57329348dbc7dfc10
Component: engine
 2014-10-20 16:51:05 -04:00
unclejack
4f4ca60461 make http usage for registry explicit 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/config.go
	daemon/daemon.go
	graph/pull.go
	graph/push.go
	graph/tags.go
	registry/registry.go
	registry/service.go
Upstream-commit: f9b4bfa59ba954c8e2d1a0f8cd42f0e75e4d46f3
Component: engine
 2014-10-20 16:51:05 -04:00
Michael Crosby
eda4d7b0de Merge pull request #8323 from crosbymichael/bump_v1.3.0 
Bump to version 1.3.0
Upstream-commit: c78b920e01c5d050105cd702fec46a4cc3b0d1f8
Component: engine
 2014-10-16 10:08:54 -07:00
Michael Crosby
1051381a0b Bump to version 1.3.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c78088fe3d1b90640c637d8c3457de3caa0c7a24
Component: engine
 2014-10-15 19:15:24 +00:00
Michael Crosby
d0f2bc8dd1 Merge branch 'master' into bump_v1.3.0 
Upstream-commit: 87bd2da5d8030a3a1909784e4f2ab1f258e8278a
Component: engine
 2014-10-15 19:15:13 +00:00
Michael Crosby
d86ec1998c Merge pull request #8578 from erikh/fix_slash 
builder: Handle trailing \ appropriately.
Upstream-commit: 9a827137725d13dbe14c577df40dc35d061152b3
Component: engine
 2014-10-15 12:11:37 -07:00
Alexandr Morozov
33fccf1f63 Merge pull request #8579 from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
Upstream-commit: abec82bdeee84cef603561ae29fed45e45130a7c
Component: engine
 2014-10-15 12:01:52 -07:00
Fred Lifton
b0a547e200 Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page 
The basics page moved, update link.
Upstream-commit: 73792969e62bed273dc8aca609d513e80856807a
Component: engine
 2014-10-15 11:34:25 -07:00
Erik Hollensbe
7e0088079e builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3f2eb353bdbb36ce26690909bcf761d4289294d6
Component: engine
 2014-10-15 18:08:23 +00:00
Fred Lifton
8a33177d4b Merge pull request #8583 from SvenDowideit/minimal-curl-command-to-tls-docker-socket 
Add a little info on how to talk to the TLS encrypted Docker Socket
Upstream-commit: 9c6346e9b2be615ef93ef50cf24550c8afbe4e39
Component: engine
 2014-10-15 11:01:05 -07:00
Alexandr Morozov
5406659093 Merge pull request #8580 from erikh/filter_comments_first 
builder: strip blank lines before processing any line continuations.
Upstream-commit: de5b1b8bb01cfd9352b4e3127c4a19db22e85d46
Component: engine
 2014-10-15 11:00:31 -07:00
Erik Hollensbe
4a6aadc8cd builder: handle anything we cannot parse the command for as a fatal error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 63637b9d277d322a06f24e3195fab48bc2a705d6
Component: engine
 2014-10-15 08:47:15 +00:00
Erik Hollensbe
ac6df7dc24 builder: comments should also be elided in the middle of statements following a line continuation. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 96f342f7030c3955900f8f2ddf06b0d36b1d993c
Component: engine
 2014-10-15 08:44:14 +00:00
Sven Dowideit
eb924a4c12 Add a little info on how to talk to the TLS encrypted Docker Socket 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
 2014-10-15 17:24:53 +10:00
Sven Dowideit
256f3dd5a2 The basics page moved, update link. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: a64ff0bf7a8c69e5698dc7e757d4ac56dd91b738
Component: engine
 2014-10-15 16:48:43 +10:00
Erik Hollensbe
8a73cf85f8 builder: strip blank lines before processing any line continuations. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a1ef2207dd1f63a4104cfbf7927931174f5438a5
Component: engine
 2014-10-15 04:00:17 +00:00
Erik Hollensbe
61f914763d builder: Handle trailing \ appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 7fa449191ce9abc3e0a5261b66d8338948f66940
Component: engine
 2014-10-15 03:08:18 +00:00
Michael Crosby
f5ae3b0b1b Merge pull request #8564 from tiborvass/remove-docker-dot-io 
change docs.docker.io to docs.docker.com in install script
Upstream-commit: dc243c812b7f5584bb5c1d0008839e4bdf0152c0
Component: engine
 2014-10-14 10:53:10 -07:00
Tibor Vass
80f48778b2 change docs.docker.io to docs.docker.com in install script 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: e5e0baa6d4651dd0182413f0db622ab82e53841f
Component: engine
 2014-10-14 13:45:26 -04:00
Michael Crosby
acd86543a1 Merge pull request #8563 from crosbymichael/remove-key-create 
Remove client key.json generation for trust
Upstream-commit: a29837020b02d94ea6065116e0b60c3290c5d40f
Component: engine
 2014-10-14 10:45:15 -07:00
Michael Crosby
17a695568c Remove client key.json generation for trust 
This removes the key generation for trust from main while it is not
being consumed.  The problem is that because this is being set in main
if a user runs as root initially the files will be owned by root.  Later
if the user sets up the docker group they are unable to read the keys.
This is half a user error and documentation problem and the other half
is management.

We decided to remove this code for now while it is not being used and
will revisit it later when the consuming features are added.  A few
options are to generate lazily and provide a clear error message on an
EPERM so that the user knows what is wrong and can correct the
permissions.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 712e8da885de00d1957a15c0c7f862fb3b2f6beb
Component: engine
 2014-10-14 17:16:45 +00:00
James Turnbull
ebdafcc5e4 Merge pull request #8558 from fgrehm/patch-4 
docs: Fix some minor typos on dockerlinks guide
Upstream-commit: 23be0486f64adf6fbe5cdd13f7277e67d64b4339
Component: engine
 2014-10-14 10:01:45 -04:00
Fabio Rehm
7dca5b65c4 docs: Fix some minor typos on dockerlinks guide 
Signed-off-by: Fabio Rehm <fgrehm@gmail.com>
Upstream-commit: 06d633e1f68d003f6183403b134142b12a24c9ca
Component: engine
 2014-10-14 10:15:35 -03:00
Victor Vieux
0873f2636a Merge pull request #8553 from tianon/fix-over-aggressive-shell-interpolation-regex 
Fix builder from being over-aggressive on ${}
Upstream-commit: 95b67895c4a5bfa604cf850d202ecb2b4a7f3f14
Component: engine
 2014-10-14 00:30:03 -07:00
Tianon Gravi
872f82a3de Fix builder from being over-aggressive on ${} 
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.

I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).

I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 24189b2c36985f8345691fa6ec2c0766cfc133a7
Component: engine
 2014-10-14 00:58:55 -06:00
Victor Vieux
5db028b7e6 Merge pull request #8552 from crosbymichael/update-libcontainer-oct2 
Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b
Upstream-commit: 0ab2f192786c0e630229f6fd888f8acc546160af
Component: engine
 2014-10-13 23:43:06 -07:00
Michael Crosby
39417f76ad Update to libcontainer 8d1d0ba38a7348c5cfdc05aea3b 
This fixes issues where the apparmor profile is not applied to processes
via docker exec.  As a side effect the parent processes were unable to
kill the additional child processes because of the profile mismatch.

Easy way to reproduce on an apparmor system:
docker run -ti debian:jessie bash
ps auxZ
- look at the labels

- in another shell
docker exec <name> sleep 1000

- go back to the first container and
ps auxZ
- make sure all processes have the correct docker-default profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 018ce19b31bbd8d752658835e9442fa7d59a47e3
Component: engine
 2014-10-14 06:24:38 +00:00
Michael Crosby
81e510d938 Merge pull request #8548 from crosbymichael/config-path 
Write s3cfg to $HOME
Upstream-commit: 9d1c9a4075306e5d1e753a836913ef119d85934f
Component: engine
 2014-10-13 20:45:16 -07:00
Michael Crosby
e0af0724d0 Write s3cfg to $HOME 
Because of the base image change, $HOME is not always / and we need to
write to the proper $HOME within the container to complete the release
process.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e0a1df8e683879bb999623a9521b272aafcc4208
Component: engine
 2014-10-14 03:34:24 +00:00