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,110 Commits 12 Branches 296 Tags
d423a092c7bc47f659bbe04aea52b56785fd04bd
Commit Graph

11110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass
d423a092c7 Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1cd89729d59948a4bdc9d6c8a4ab01cedaeb193f
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass
edee2c60d1 symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 566146bc13efb6f8b1e6d4a41382f80546ac1782
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass
14630dbebf symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 1ebafeb635eead4d3eedf4b5bbaf7e1e2d760086
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass
a8db79a140 Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 18193ae0a3a1fb506e7855c5e2e02c2c2d4c1a3e
Component: engine
 2014-12-09 14:56:16 -05:00
Tianon Gravi
d44e0801be Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: cd745d5c6e012ff603f25e1314cfb4c0b09e906c
Component: engine
 2014-12-09 14:56:16 -05:00
Tibor Vass
0c158f8edc Merge pull request #9316 from tiborvass/bump_v1.3.2 
Bump v1.3.2
Upstream-commit: 6f514d28c0270860a6d508113499b90ea60dcc48
Component: engine
 2014-11-24 16:49:28 -05:00
Tibor Vass
c02029344c Bump to version v1.3.2 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 39fa2faad2f3d6fa5133de4eb740677202f53ef4
Component: engine
 2014-11-24 12:38:01 -05:00
Tibor Vass
4971a5084d docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 324953d74adf6803efd8796274a80ae0b0cbdbf8
Component: engine
 2014-11-24 12:38:01 -05:00
Tibor Vass
f1bf5322e2 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: b256616589700f895845e3c5aa72e9b4511cd67d
Component: engine
 2014-11-24 11:51:37 -05:00
unclejack
f74783e034 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 409f65bfd1bde5e45c68e2e1ecf68016ed91426b
Component: engine
 2014-11-24 11:51:37 -05:00
Derek McGowan
4f05e6fed5 Skip V2 registry and immediately fallback to V1 when mirrors are provided 
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 87f59e3802a44aecdb8febfd34a9661e136ffcf4
Component: engine
 2014-11-14 15:30:58 -08:00
Tibor Vass
9fbae76eab Rewrite documentation for insecure registries 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/reference/commandline/cli.md
Upstream-commit: c650d17a266f3fec3c48d7e3c79afe13a6ec139a
Component: engine
 2014-11-14 14:20:19 -08:00
Tibor Vass
a38625e9ef Add the possibility of specifying a subnet for --insecure-registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
Upstream-commit: 5e2d02ab73c06aec4ddeca6965dee3ef3cf6a04e
Component: engine
 2014-11-14 14:20:19 -08:00
Tibor Vass
5382572e9b registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: eb3738347ade64c2b14995c30b400bc6aa48b84e
Component: engine
 2014-11-14 14:20:19 -08:00
Tibor Vass
1bcf92b686 Put mock registry address in insecureRegistries for unit tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry_mock_test.go
Upstream-commit: 6152460c1e4c058676476314320b17e54de0c621
Component: engine
 2014-11-14 14:20:19 -08:00
Tibor Vass
1d906bed7b registry: refactor registry.IsSecure calls into registry.NewEndpoint 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
	registry/endpoint_test.go
	registry/registry_test.go
Upstream-commit: 1527979e87d361539c2791d4e89602aea3cce174
Component: engine
 2014-11-14 14:05:31 -08:00
Tibor Vass
46a36325cb archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 04175d07634600f2a5cf43dd197eb2a926aba8b9
Component: engine
 2014-11-14 23:45:37 +02:00
Tibor Vass
8b11f8cf5c archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a111eea20cad697bb58ebfbf455ee1670c7cf82c
Component: engine
 2014-11-14 23:45:29 +02:00
Tibor Vass
0473c8a94e archive: add breakout tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	pkg/archive/archive.go
		fixed conflict which git couldn't fix with the added BreakoutError
Upstream-commit: ea361c0476d03f44051289d8e3c128d699c76acc
Component: engine
 2014-11-14 23:44:20 +02:00
Thomas Orozco
f3c864f896 Fix: Failed Start breaks VolumesFrom 
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).

Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.

The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.

Fixes: #8726

Signed-off-by: Thomas Orozco <thomas@orozco.fr>

Conflicts:
	integration-cli/docker_cli_start_test.go
		cli integration test
Upstream-commit: 967f80f3cceb96f85a4795d42eeb7b84ae0ce24a
Component: engine
 2014-11-12 00:14:04 +02:00
unclejack
0aef38f7a2 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 8d90b0faf8e289edc2b4c13c6f312995745f161b
Component: engine
 2014-11-11 23:20:16 +02:00
Tibor Vass
db09646f3d pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 3ac6394b8082d4700483d52fbfe54914be537d9e
Component: engine
 2014-11-11 23:20:09 +02:00
unclejack
5bc98f602b add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 0357b26c1b5ecc3a4d0d1b2e7cf63ea8e5f70eba
Component: engine
 2014-11-11 23:20:02 +02:00
unclejack
948a1940da pkg/archive: add interface for Untar 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1d4a82365bfa215767fc4a4cc7e4d5d10dbcd0e4
Component: engine
 2014-11-11 23:19:54 +02:00
Josh Hawn
2ea72cb370 Use archive.CopyWithTar in vfs.Create 
The vfs storage driver currently shells out to the `cp` binary on the host
system to perform an 'archive' copy of the base image to a new directory.
The archive option preserves the modified time of the files which are created
but there was an issue where it was unable to preserve the modified time of
copied symbolic links on some host systems with an outdated version of `cp`.

This change no longer relies on the host system implementation and instead
utilizes the `CopyWithTar` function found in `pkg/archive` which is used
to copy from source to destination directory using a Tar archive, which
should correctly preserve file attributes.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 3ab5251f5620e7b8b052ee331f9ac1fbdbb725b1
Component: engine
 2014-11-11 23:19:43 +02:00
unclejack
93f16f1a81 pkg/reexec: move reexec code to a new package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	integration/runtime_test.go
		fixed imports
Upstream-commit: d51a02091ca5485ed42b336d3df8c6c4ab2d9a6b
Component: engine
 2014-11-11 23:19:34 +02:00
Michael Crosby
c12b99ac62 Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 0573b17b24b66c26e8311d55dff4d81923030f75
Component: engine
 2014-11-10 21:04:17 +02:00
Michael Crosby
b670ee9b69 Move security opts to HostConfig 
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.

We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct.  Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c9379eb3fbbc484c056f5a5e49d8d0b755a29c45
Component: engine
 2014-11-10 21:04:01 +02:00
unclejack
b4519950ef pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 662ca4114de579e53e670296615ceb49b8c32d75
Component: engine
 2014-11-10 17:57:54 +02:00
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