docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,098 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

11098 Commits

Author SHA1 Message Date
Tibor Vass 5e2d02ab73 Add the possibility of specifying a subnet for --insecure-registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
 2014-11-14 14:20:19 -08:00
Tibor Vass eb3738347a registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 14:20:19 -08:00
Tibor Vass 6152460c1e Put mock registry address in insecureRegistries for unit tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry_mock_test.go
 2014-11-14 14:20:19 -08:00
Tibor Vass 1527979e87 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
 2014-11-14 14:05:31 -08:00
Tibor Vass 04175d0763 archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 23:45:37 +02:00
Tibor Vass a111eea20c archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 23:45:29 +02:00
Tibor Vass ea361c0476 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
 2014-11-14 23:44:20 +02:00
Thomas Orozco 967f80f3cc 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
 2014-11-12 00:14:04 +02:00
unclejack 8d90b0faf8 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:20:16 +02:00
Tibor Vass 3ac6394b80 pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-11 23:20:09 +02:00
unclejack 0357b26c1b add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:20:02 +02:00
unclejack 1d4a82365b pkg/archive: add interface for Untar 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:19:54 +02:00
Josh Hawn 3ab5251f56 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)
 2014-11-11 23:19:43 +02:00
unclejack d51a02091c 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
 2014-11-11 23:19:34 +02:00
Michael Crosby 0573b17b24 Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-10 21:04:17 +02:00
Michael Crosby c9379eb3fb 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>
 2014-11-10 21:04:01 +02:00
unclejack 662ca4114d pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-10 17:57:54 +02:00
shuai-z 1d1b813d25 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>
 2014-11-10 17:57:01 +02:00
Alexandr Morozov fd9c2ae27d 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
 2014-11-07 16:35:50 +02:00
unclejack 09c38a8d43 bump fpm to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-07 16:18:53 +02:00
Tibor Vass 86292adbd9 Merge pull request #8861 from tiborvass/bump_v1.3.1 
Bump v1.3.1
 2014-10-30 12:43:43 -04:00
Tibor Vass 4e9bbfa900 Bump to version v1.3.1 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-30 09:44:46 -04:00
Tibor Vass e6efbd6596 Fix login command 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-30 09:17:11 -04:00
Erik Hollensbe 9fc8b7f4e1 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)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe 463297ffe9 builder: whitelist verbs useful for environment replacement. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe 2dac82eb82 builder: handle escapes without swallowing all of them. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe 7f8cdeb18b 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)
 2014-10-30 09:17:11 -04:00
Tibor Vass 3d287811d7 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
 2014-10-28 10:42:30 -04:00
Erik Hollensbe 21ab75afe0 builder: handle cases where onbuild is not uppercase. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-21 17:08:05 -04:00
Brian Goff 66fba7c46e Clean volume paths 
Fixes #8659

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

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-20 17:35:43 -04:00
Erik Hollensbe cf23053eb1 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-20 16:53:37 -04:00
Daniel, Dao Quang Minh 8caacb18f8 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
 2014-10-20 16:51:06 -04:00
Tianon Gravi 7d9ccc2636 Fix more missing HOME references 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-10-20 16:51:06 -04:00
Jessica Frazelle ada9ac7b13 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-10-20 16:51:06 -04:00
Tibor Vass e134f1f74a 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
 2014-10-20 16:51:06 -04:00
Michael Crosby f43e77fc12 Don't hard code true for auth job 
Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
 2014-10-20 16:51:05 -04:00
Michael Crosby c66196a9dc Expand documentation for --insecure-registries 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-10-20 16:51:05 -04:00
Michael Crosby c0598aced0 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
 2014-10-20 16:51:05 -04:00
unclejack f9b4bfa59b 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
 2014-10-20 16:51:05 -04:00
Michael Crosby c78b920e01 Merge pull request #8323 from crosbymichael/bump_v1.3.0 
Bump to version 1.3.0
 2014-10-16 10:08:54 -07:00
Michael Crosby c78088fe3d Bump to version 1.3.0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-15 19:15:24 +00:00
Michael Crosby 87bd2da5d8 Merge branch 'master' into bump_v1.3.0 2014-10-15 19:15:13 +00:00
Michael Crosby 9a82713772 Merge pull request #8578 from erikh/fix_slash 
builder: Handle trailing \ appropriately.
 2014-10-15 12:11:37 -07:00
Alexandr Morozov abec82bdee Merge pull request #8579 from erikh/builder_html_panic 
builder: handle anything we cannot parse the command for as a fatal error
 2014-10-15 12:01:52 -07:00
Fred Lifton 73792969e6 Merge pull request #8582 from SvenDowideit/api-docs-link-to-basics-page 
The basics page moved, update link.
 2014-10-15 11:34:25 -07:00
Erik Hollensbe 3f2eb353bd builder: provide a friendly message on parser errors 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 18:08:23 +00:00
Fred Lifton 9c6346e9b2 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
 2014-10-15 11:01:05 -07:00
Alexandr Morozov de5b1b8bb0 Merge pull request #8580 from erikh/filter_comments_first 
builder: strip blank lines before processing any line continuations.
 2014-10-15 11:00:31 -07:00
Erik Hollensbe 63637b9d27 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)
 2014-10-15 08:47:15 +00:00