clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 21:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,087 Commits 9 Branches 112 Tags
1d4a82365bfa215767fc4a4cc7e4d5d10dbcd0e4
Commit Graph

11087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
v1.3.1 		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>
v1.3.0 		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
Erik Hollensbe 96f342f703 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)
 2014-10-15 08:44:14 +00:00
Sven Dowideit 1c68de798f 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)
 2014-10-15 17:24:53 +10:00
Sven Dowideit a64ff0bf7a The basics page moved, update link. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-10-15 16:48:43 +10:00
Erik Hollensbe a1ef2207dd builder: strip blank lines before processing any line continuations. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 04:00:17 +00:00
Erik Hollensbe 7fa449191c builder: Handle trailing \ appropriately. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-15 03:08:18 +00:00
Michael Crosby dc243c812b Merge pull request #8564 from tiborvass/remove-docker-dot-io 
change docs.docker.io to docs.docker.com in install script
 2014-10-14 10:53:10 -07:00
Tibor Vass e5e0baa6d4 change docs.docker.io to docs.docker.com in install script 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-14 13:45:26 -04:00
Michael Crosby a29837020b Merge pull request #8563 from crosbymichael/remove-key-create 
Remove client key.json generation for trust
 2014-10-14 10:45:15 -07:00
Michael Crosby 712e8da885 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>
 2014-10-14 17:16:45 +00:00
James Turnbull 23be0486f6 Merge pull request #8558 from fgrehm/patch-4 
docs: Fix some minor typos on dockerlinks guide
 2014-10-14 10:01:45 -04:00
Fabio Rehm 06d633e1f6 docs: Fix some minor typos on dockerlinks guide 
Signed-off-by: Fabio Rehm <fgrehm@gmail.com>
 2014-10-14 10:15:35 -03:00