diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c5218eea2df7c1f37ee83d12a046b8735678781..f958bbd48c4c52339ab11781374f8cd53c1f8c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## 1.3.1 (2014-10-28) + +#### Security +* Prevent fallback to SSL protocols < TLS 1.0 for client, daemon and registry ++ Secure HTTPS connection to registries with certificate verification and without HTTP fallback unless `--insecure-registry` is specified + +#### Runtime +- Fix issue where volumes would not be shared + +#### Client +- Fix issue with `--iptables=false` not automatically setting `--ip-masq=false` +- Fix docker run output to non-TTY stdout + +#### Builder +- Fix escaping `$` for environment variables +- Fix issue with lowercase `onbuild` Dockerfile instruction +- Restrict envrionment variable expansion to `ENV`, `ADD`, `COPY`, `WORKDIR`, `EXPOSE`, `VOLUME` and `USER` + ## 1.3.0 (2014-10-14) #### Notable features since 1.2.0 diff --git a/VERSION b/VERSION index f0bb29e76388856b273698ae6064b0380ce5e5d2..3a3cd8cc8b079cb410a465d2925b9cbd703115cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0 +1.3.1 diff --git a/api/client/commands.go b/api/client/commands.go index 6c4e5c55fe42f9655ef32329852057ae4e123ca2..2c44bb63c555d6ac988482550352fce6a0ceb85e 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -1986,6 +1986,10 @@ func (cli *DockerCli) CmdTag(args ...string) error { } func (cli *DockerCli) pullImage(image string) error { + return cli.pullImageCustomOut(image, cli.out) +} + +func (cli *DockerCli) pullImageCustomOut(image string, out io.Writer) error { v := url.Values{} repos, tag := parsers.ParseRepositoryTag(image) // pull only the image tagged 'latest' if no tag was specified @@ -2014,7 +2018,7 @@ func (cli *DockerCli) pullImage(image string) error { registryAuthHeader := []string{ base64.URLEncoding.EncodeToString(buf), } - if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.out, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil { + if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, out, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil { return err } return nil @@ -2081,7 +2085,8 @@ func (cli *DockerCli) createContainer(config *runconfig.Config, hostConfig *runc if statusCode == 404 { fmt.Fprintf(cli.err, "Unable to find image '%s' locally\n", config.Image) - if err = cli.pullImage(config.Image); err != nil { + // we don't want to write to stdout anything apart from container.ID + if err = cli.pullImageCustomOut(config.Image, cli.err); err != nil { return nil, err } // Retry diff --git a/api/server/server.go b/api/server/server.go index 897dd6142f1acc3cee3235969754ec49077181df..93b8b60a8fafe31f0fadf0eea6d13b6811ab2640 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -1439,6 +1439,8 @@ func ListenAndServe(proto, addr string, job *engine.Job) error { tlsConfig := &tls.Config{ NextProtos: []string{"http/1.1"}, Certificates: []tls.Certificate{cert}, + // Avoid fallback on insecure SSL protocols + MinVersion: tls.VersionTLS10, } if job.GetenvBool("TlsVerify") { certPool := x509.NewCertPool() diff --git a/builder/dispatchers.go b/builder/dispatchers.go index 82bb6ce5fd093dffb5fac4efb363d8c0a5c18edf..2184e48a817daf4d4a03a4574c93cacef3e98cb1 100644 --- a/builder/dispatchers.go +++ b/builder/dispatchers.go @@ -11,6 +11,7 @@ import ( "fmt" "io/ioutil" "path/filepath" + "regexp" "strings" "github.com/docker/docker/nat" @@ -129,7 +130,7 @@ func onbuild(b *Builder, args []string, attributes map[string]bool, original str return fmt.Errorf("%s isn't allowed as an ONBUILD trigger", triggerInstruction) } - original = strings.TrimSpace(strings.TrimLeft(original, "ONBUILD")) + original = regexp.MustCompile(`(?i)^\s*ONBUILD\s*`).ReplaceAllString(original, "") b.Config.OnBuild = append(b.Config.OnBuild, original) return b.commit("", b.Config.Cmd, fmt.Sprintf("ONBUILD %s", original)) @@ -194,7 +195,7 @@ func run(b *Builder, args []string, attributes map[string]bool, original string) defer func(cmd []string) { b.Config.Cmd = cmd }(cmd) - log.Debugf("Command to be executed: %v", b.Config.Cmd) + log.Debugf("[BUILDER] Command to be executed: %v", b.Config.Cmd) hit, err := b.probeCache() if err != nil { @@ -233,7 +234,7 @@ func run(b *Builder, args []string, attributes map[string]bool, original string) func cmd(b *Builder, args []string, attributes map[string]bool, original string) error { b.Config.Cmd = handleJsonArgs(args, attributes) - if !attributes["json"] && len(b.Config.Entrypoint) == 0 { + if !attributes["json"] { b.Config.Cmd = append([]string{"/bin/sh", "-c"}, b.Config.Cmd...) } @@ -260,14 +261,14 @@ func entrypoint(b *Builder, args []string, attributes map[string]bool, original parsed := handleJsonArgs(args, attributes) switch { - case len(parsed) == 0: - // ENTYRPOINT [] - b.Config.Entrypoint = nil case attributes["json"]: // ENTRYPOINT ["echo", "hi"] b.Config.Entrypoint = parsed + case len(parsed) == 0: + // ENTRYPOINT [] + b.Config.Entrypoint = nil default: - // ENTYRPOINT echo hi + // ENTRYPOINT echo hi b.Config.Entrypoint = []string{"/bin/sh", "-c", parsed[0]} } diff --git a/builder/evaluator.go b/builder/evaluator.go index 4122616350abb4c70ef2a4a03e40280acc668297..7884d36ac2788c8466ababd27925cf3ba57d8bba 100644 --- a/builder/evaluator.go +++ b/builder/evaluator.go @@ -41,6 +41,17 @@ var ( ErrDockerfileEmpty = errors.New("Dockerfile cannot be empty") ) +// Environment variable interpolation will happen on these statements only. +var replaceEnvAllowed = map[string]struct{}{ + "env": {}, + "add": {}, + "copy": {}, + "workdir": {}, + "expose": {}, + "volume": {}, + "user": {}, +} + var evaluateTable map[string]func(*Builder, []string, map[string]bool, string) error func init() { @@ -149,7 +160,7 @@ func (b *Builder) Run(context io.Reader) (string, error) { b.dockerfile = ast // some initializations that would not have been supplied by the caller. - b.Config = &runconfig.Config{Entrypoint: []string{}, Cmd: nil} + b.Config = &runconfig.Config{} b.TmpContainers = map[string]struct{}{} for i, n := range b.dockerfile.Children { @@ -196,13 +207,18 @@ func (b *Builder) dispatch(stepN int, ast *parser.Node) error { if cmd == "onbuild" { ast = ast.Next.Children[0] - strs = append(strs, b.replaceEnv(ast.Value)) + strs = append(strs, ast.Value) msg += " " + ast.Value } for ast.Next != nil { ast = ast.Next - strs = append(strs, b.replaceEnv(ast.Value)) + var str string + str = ast.Value + if _, ok := replaceEnvAllowed[cmd]; ok { + str = b.replaceEnv(ast.Value) + } + strs = append(strs, str) msg += " " + ast.Value } diff --git a/builder/parser/parser.go b/builder/parser/parser.go index 5e8bcb5a9cd40d186ed4ade31f094ea754b9d5af..6b0ab7ab8c72983ff1ce53339342e297ae9f3631 100644 --- a/builder/parser/parser.go +++ b/builder/parser/parser.go @@ -87,10 +87,11 @@ func parseLine(line string) (string, *Node, error) { if sexp.Value != "" || sexp.Next != nil || sexp.Children != nil { node.Next = sexp - node.Attributes = attrs - node.Original = line } + node.Attributes = attrs + node.Original = line + return "", node, nil } diff --git a/builder/support.go b/builder/support.go index a084190f2cb81fb8ed3efd38bd9e629a2a9ce353..6833457f3a29f7f6fa888a378bd5b9f21e7c69be 100644 --- a/builder/support.go +++ b/builder/support.go @@ -10,13 +10,26 @@ var ( // `\$` - match literal $ // `[[:alnum:]_]+` - match things like `$SOME_VAR` // `{[[:alnum:]_]+}` - match things like `${SOME_VAR}` - tokenEnvInterpolation = regexp.MustCompile(`(\\\\+|[^\\]|\b|\A)\$([[:alnum:]_]+|{[[:alnum:]_]+})`) + tokenEnvInterpolation = regexp.MustCompile(`(\\|\\\\+|[^\\]|\b|\A)\$([[:alnum:]_]+|{[[:alnum:]_]+})`) // this intentionally punts on more exotic interpolations like ${SOME_VAR%suffix} and lets the shell handle those directly ) // handle environment replacement. Used in dispatcher. func (b *Builder) replaceEnv(str string) string { for _, match := range tokenEnvInterpolation.FindAllString(str, -1) { + idx := strings.Index(match, "\\$") + if idx != -1 { + if idx+2 >= len(match) { + str = strings.Replace(str, match, "\\$", -1) + continue + } + + prefix := match[:idx] + stripped := match[idx+2:] + str = strings.Replace(str, match, prefix+"$"+stripped, -1) + continue + } + match = match[strings.Index(match, "$"):] matchKey := strings.Trim(match, "${}") diff --git a/builtins/builtins.go b/builtins/builtins.go index f952d728b2ce3faf32ebcbe1abeaf6b77c152b3b..41bb249286450cf958cbac47f76d4603bcc5b621 100644 --- a/builtins/builtins.go +++ b/builtins/builtins.go @@ -10,7 +10,6 @@ import ( "github.com/docker/docker/engine" "github.com/docker/docker/events" "github.com/docker/docker/pkg/parsers/kernel" - "github.com/docker/docker/registry" ) func Register(eng *engine.Engine) error { @@ -26,7 +25,8 @@ func Register(eng *engine.Engine) error { if err := eng.Register("version", dockerVersion); err != nil { return err } - return registry.NewService().Install(eng) + + return nil } // remote: a RESTful api for cross-docker communication diff --git a/daemon/config.go b/daemon/config.go index 8780294ce1cc5cc12df1a71b7a83ccdc10ec960c..9e8d08e2a6e76ca38c77552d026dcd5028fe2cbf 100644 --- a/daemon/config.go +++ b/daemon/config.go @@ -31,6 +31,7 @@ type Config struct { BridgeIface string BridgeIP string FixedCIDR string + InsecureRegistries []string InterContainerCommunication bool GraphDriver string GraphOptions []string @@ -55,6 +56,7 @@ func (config *Config) InstallFlags() { flag.StringVar(&config.BridgeIP, []string{"#bip", "-bip"}, "", "Use this CIDR notation address for the network bridge's IP, not compatible with -b") flag.StringVar(&config.BridgeIface, []string{"b", "-bridge"}, "", "Attach containers to a pre-existing network bridge\nuse 'none' to disable container networking") flag.StringVar(&config.FixedCIDR, []string{"-fixed-cidr"}, "", "IPv4 subnet for fixed IPs (ex: 10.20.0.0/16)\nthis subnet must be nested in the bridge subnet (which is defined by -b or --bip)") + opts.ListVar(&config.InsecureRegistries, []string{"-insecure-registry"}, "Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback)") flag.BoolVar(&config.InterContainerCommunication, []string{"#icc", "-icc"}, true, "Enable inter-container communication") flag.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", "Force the Docker runtime to use a specific storage driver") flag.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, "native", "Force the Docker runtime to use a specific exec driver") diff --git a/daemon/daemon.go b/daemon/daemon.go index 235788c684930501c83da70b33e251d0d3bf1f37..d069797ac42f5bfb64477febebca0e632e885dc7 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -731,7 +731,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.") } if !config.EnableIptables && config.EnableIpMasq { - return nil, fmt.Errorf("You specified --iptables=false with --ipmasq=true. IP masquerading uses iptables to function. Please set --ipmasq to false or --iptables to true.") + config.EnableIpMasq = false } config.DisableNetwork = config.BridgeIface == disableNetworkBridge @@ -831,7 +831,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) } log.Debugf("Creating repository list") - repositories, err := graph.NewTagStore(path.Join(config.Root, "repositories-"+driver.String()), g, config.Mirrors) + repositories, err := graph.NewTagStore(path.Join(config.Root, "repositories-"+driver.String()), g, config.Mirrors, config.InsecureRegistries) if err != nil { return nil, fmt.Errorf("Couldn't create Tag store: %s", err) } diff --git a/daemon/volumes.go b/daemon/volumes.go index c7a8d7bfcb6dab7468a8f67a0ba8863c1bc442dd..b34d9678cb966171c8c1fac669ab9da49edcc46d 100644 --- a/daemon/volumes.go +++ b/daemon/volumes.go @@ -133,6 +133,7 @@ func (container *Container) parseVolumeMountConfig() (map[string]*Mount, error) // Get the rest of the volumes for path := range container.Config.Volumes { // Check if this is already added as a bind-mount + path = filepath.Clean(path) if _, exists := mounts[path]; exists { continue } @@ -182,6 +183,8 @@ func parseBindMountSpec(spec string) (string, string, bool, error) { return "", "", false, fmt.Errorf("cannot bind mount volume: %s volume paths must be absolute.", path) } + path = filepath.Clean(path) + mountToPath = filepath.Clean(mountToPath) return path, mountToPath, writable, nil } diff --git a/docker/daemon.go b/docker/daemon.go index eef17efdc43c74cfe77898140f5685f098b87617..8b5826f344f615d0d38ba7d84f366cefe786f579 100644 --- a/docker/daemon.go +++ b/docker/daemon.go @@ -14,6 +14,7 @@ import ( "github.com/docker/docker/engine" flag "github.com/docker/docker/pkg/mflag" "github.com/docker/docker/pkg/signal" + "github.com/docker/docker/registry" ) const CanDaemon = true @@ -33,11 +34,17 @@ func mainDaemon() { } eng := engine.New() signal.Trap(eng.Shutdown) + // Load builtins if err := builtins.Register(eng); err != nil { log.Fatal(err) } + // load registry service + if err := registry.NewService(daemonCfg.InsecureRegistries).Install(eng); err != nil { + log.Fatal(err) + } + // load the daemon in the background so we can immediately start // the http api so that connections don't fail while the daemon // is booting diff --git a/docker/docker.go b/docker/docker.go index 37cd155bb7096af265cb86316981241cc8bdea14..f0cbb6f6abd8b721bc6ec28f96098f541b30002a 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -93,6 +93,8 @@ func main() { } tlsConfig.Certificates = []tls.Certificate{cert} } + // Avoid fallback to SSL protocols < TLS1.0 + tlsConfig.MinVersion = tls.VersionTLS10 } if *flTls || *flTlsVerify { diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml old mode 100755 new mode 100644 index 5ea8d56e606c82fba53a8a4709b36052e218cb3a..25f84b5a081151f8c22a0648d1a255a3a4fb8f4a --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -26,6 +26,7 @@ pages: # Introduction: - ['index.md', 'About', 'Docker'] +- ['release-notes.md', 'About', 'Release Notes'] - ['introduction/index.md', '**HIDDEN**'] - ['introduction/understanding-docker.md', 'About', 'Understanding Docker'] diff --git a/docs/sources/index.md b/docs/sources/index.md index 7e60b0dc6d27e6207d638bcae5b14b13a96422bc..949fe72e0a8269cddebf70b5fd7e7e59efb8d0ff 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -88,40 +88,4 @@ implementation, check out the [Docker User Guide](/userguide/). ## Release Notes -**Version 1.3.0** - -This version fixes a number of bugs and issues and adds new functions and other -improvements. These include: - -*New command: `docker exec`* - -The new `docker exec` command lets you run a process in an existing, active -container. The command has APIs for both the daemon and the client. With -`docker exec`, you'll be able to do things like add or remove devices from running containers, debug running containers, and run commands that are not -part of the container's static specification. - -*New command: `docker create`* - -Traditionally, the `docker run` command has been used to both create a -container and spawn a process to run it. The new `docker create` command breaks -this apart, letting you set up a container without actually starting it. This -provides more control over management of the container lifecycle, giving you the -ability to configure things like volumes or port mappings before the container -is started. For example, in a rapid-response scaling situation, you could use -`create` to prepare and stage ten containers in anticipation of heavy loads. - -*New provenance features* - -Official images are now signed by Docker, Inc. to improve your confidence and -security. Look for the blue ribbons on the [Docker Hub](https://hub.docker.com/). -The Docker Engine has been updated to automatically verify that a given Official -Repo has a current, valid signature. If no valid signature is detected, Docker -Engine will use a prior image. - - -*Other improvements & changes* - -We've added a new security options flag that lets you set SELinux and AppArmor -labels and profiles. This means you'll longer have to use `docker run ---privileged on kernels that support SE Linux or AppArmor. - +A summary of the changes in each release in the current series can now be found on the separate [Release Notes page](/release-notes/) diff --git a/docs/sources/reference/api/hub_registry_spec.md b/docs/sources/reference/api/hub_registry_spec.md index ee15277a440ac739564a7ae11c397580fff17321..853eda4aee18004c8b752f94136948786a759d55 100644 --- a/docs/sources/reference/api/hub_registry_spec.md +++ b/docs/sources/reference/api/hub_registry_spec.md @@ -4,7 +4,9 @@ page_keywords: docker, registry, api, hub # The Docker Hub and the Registry spec -## The 3 roles +## The three roles + +There are three major components playing a role in the Docker ecosystem. ### Docker Hub @@ -21,13 +23,15 @@ The Docker Hub has different components: - Authentication service - Tokenization -The Docker Hub is authoritative for those information. +The Docker Hub is authoritative for that information. -We expect that there will be only one instance of the Docker Hub, run and +There is only one instance of the Docker Hub, run and managed by Docker Inc. ### Registry +The registry has the following characteristics: + - It stores the images and the graph for a set of repositories - It does not have user accounts data - It has no notion of user accounts or authorization @@ -37,35 +41,35 @@ managed by Docker Inc. - It doesn't have a local database - [Source Code](https://github.com/docker/docker-registry) -We expect that there will be multiple registries out there. To help to +We expect that there will be multiple registries out there. To help you grasp the context, here are some examples of registries: - **sponsor registry**: such a registry is provided by a third-party hosting infrastructure as a convenience for their customers and the - docker community as a whole. Its costs are supported by the third + Docker community as a whole. Its costs are supported by the third party, but the management and operation of the registry are - supported by dotCloud. It features read/write access, and delegates + supported by Docker, Inc. It features read/write access, and delegates authentication and authorization to the Docker Hub. - **mirror registry**: such a registry is provided by a third-party hosting infrastructure but is targeted at their customers only. Some mechanism (unspecified to date) ensures that public images are pulled from a sponsor registry to the mirror registry, to make sure - that the customers of the third-party provider can “docker pull” + that the customers of the third-party provider can `docker pull` those images locally. - **vendor registry**: such a registry is provided by a software - vendor, who wants to distribute docker images. It would be operated + vendor who wants to distribute docker images. It would be operated and managed by the vendor. Only users authorized by the vendor would be able to get write access. Some images would be public (accessible for anyone), others private (accessible only for authorized users). Authentication and authorization would be delegated to the Docker Hub. - The goal of vendor registries is to let someone do “docker pull - basho/riak1.3” and automatically push from the vendor registry - (instead of a sponsor registry); i.e. get all the convenience of a + The goal of vendor registries is to let someone do `docker pull + basho/riak1.3` and automatically push from the vendor registry + (instead of a sponsor registry); i.e., vendors get all the convenience of a sponsor registry, while retaining control on the asset distribution. - **private registry**: such a registry is located behind a firewall, or protected by an additional security layer (HTTP authorization, SSL client-side certificates, IP address authorization...). The - registry is operated by a private entity, outside of dotCloud's + registry is operated by a private entity, outside of Docker's control. It can optionally delegate additional authorization to the Docker Hub, but it is not mandatory. @@ -77,7 +81,7 @@ grasp the context, here are some examples of registries: > - local mount point; > - remote docker addressed through SSH. -The latter would only require two new commands in docker, e.g., +The latter would only require two new commands in Docker, e.g., `registryget` and `registryput`, wrapping access to the local filesystem (and optionally doing consistency checks). Authentication and authorization are then delegated diff --git a/docs/sources/reference/api/registry_api.md b/docs/sources/reference/api/registry_api.md index 1ae37dba6d6c25b8738915fd9513f43930f0313e..d6130bf7679bc3b4fc877f848ff2f1142686dd6a 100644 --- a/docs/sources/reference/api/registry_api.md +++ b/docs/sources/reference/api/registry_api.md @@ -21,30 +21,30 @@ grasp the context, here are some examples of registries: - **sponsor registry**: such a registry is provided by a third-party hosting infrastructure as a convenience for their customers and the - docker community as a whole. Its costs are supported by the third + Docker community as a whole. Its costs are supported by the third party, but the management and operation of the registry are - supported by dotCloud. It features read/write access, and delegates + supported by Docker. It features read/write access, and delegates authentication and authorization to the Index. - **mirror registry**: such a registry is provided by a third-party hosting infrastructure but is targeted at their customers only. Some mechanism (unspecified to date) ensures that public images are pulled from a sponsor registry to the mirror registry, to make sure - that the customers of the third-party provider can “docker pull” + that the customers of the third-party provider can `docker pull` those images locally. - **vendor registry**: such a registry is provided by a software - vendor, who wants to distribute docker images. It would be operated + vendor, who wants to distribute Docker images. It would be operated and managed by the vendor. Only users authorized by the vendor would be able to get write access. Some images would be public (accessible for anyone), others private (accessible only for authorized users). Authentication and authorization would be delegated to the Index. - The goal of vendor registries is to let someone do “docker pull - basho/riak1.3” and automatically push from the vendor registry - (instead of a sponsor registry); i.e. get all the convenience of a + The goal of vendor registries is to let someone do `docker pull + basho/riak1.3` and automatically push from the vendor registry + (instead of a sponsor registry); i.e., get all the convenience of a sponsor registry, while retaining control on the asset distribution. - **private registry**: such a registry is located behind a firewall, or protected by an additional security layer (HTTP authorization, SSL client-side certificates, IP address authorization...). The - registry is operated by a private entity, outside of dotCloud's + registry is operated by a private entity, outside of Docker's control. It can optionally delegate additional authorization to the Index, but it is not mandatory. @@ -52,7 +52,7 @@ grasp the context, here are some examples of registries: > Mirror registries and private registries which do not use the Index > don't even need to run the registry code. They can be implemented by any > kind of transport implementing HTTP GET and PUT. Read-only registries -> can be powered by a simple static HTTP server. +> can be powered by a simple static HTTPS server. > **Note**: > The latter implies that while HTTP is the protocol of choice for a registry, @@ -60,13 +60,20 @@ grasp the context, here are some examples of registries: > > - HTTP with GET (and PUT for read-write registries); > - local mount point; -> - remote docker addressed through SSH. +> - remote Docker addressed through SSH. -The latter would only require two new commands in docker, e.g., +The latter would only require two new commands in Docker, e.g., `registryget` and `registryput`, wrapping access to the local filesystem (and optionally doing consistency checks). Authentication and authorization are then delegated to SSH (e.g., with public keys). +> **Note**: +> Private registry servers that expose an HTTP endpoint need to be secured with +> TLS (preferably TLSv1.2, but at least TLSv1.0). Make sure to put the CA +> certificate at /etc/docker/certs.d/my.registry.com:5000/ca.crt on the Docker +> host, so that the daemon can securely access the private registry. +> Support for SSLv3 and lower is not available due to security issues. + The default namespace for a private repository is `library`. # Endpoints diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 86f02b6cf12c1191b8fb98dd3cd518ba4f605fff..a57b4cc28ec4fdd8bff9515cf3d53ee17ffc6fc2 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -70,6 +70,7 @@ expect an integer, and they can only be specified once. -g, --graph="/var/lib/docker" Path to use as the root of the Docker runtime -H, --host=[] The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd. --icc=true Enable inter-container communication + --insecure-registry=[] Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback) --ip=0.0.0.0 Default IP address to use when binding container ports --ip-forward=true Enable net.ipv4.ip_forward --ip-masq=true Enable IP masquerading for bridge's IP range @@ -111,7 +112,12 @@ direct access to the Docker daemon - and should be secured either using the [built in https encrypted socket](/articles/https/), or by putting a secure web proxy in front of it. You can listen on port `2375` on all network interfaces with `-H tcp://0.0.0.0:2375`, or on a particular network interface using its IP -address: `-H tcp://192.168.59.103:2375`. +address: `-H tcp://192.168.59.103:2375`. It is conventional to use port `2375` +for un-encrypted, and port `2376` for encrypted communication with the daemon. + +> **Note** If you're using an HTTPS encrypted socket, keep in mind that only TLS1.0 +> and greater are supported. Protocols SSLv3 and under are not supported anymore +> for security reasons. On Systemd based systems, you can communicate with the daemon via [systemd socket activation](http://0pointer.de/blog/projects/socket-activation.html), use @@ -194,6 +200,16 @@ to other machines on the Internet. This may interfere with some network topologi can be disabled with --ip-masq=false. +By default, Docker will assume all registries are secured via TLS with certificate verification +enabled. Prior versions of Docker used an auto fallback if a registry did not support TLS +(or if the TLS connection failed). This introduced the opportunity for Man In The Middle (MITM) +attacks, so as of Docker 1.3.1, the user must now specify the `--insecure-registry` daemon flag +for each insecure registry. An insecure registry is either not using TLS (i.e. plain text HTTP), +or is using TLS with a CA certificate not known by the Docker daemon (i.e. certification +verification disabled). For example, if there is a registry listening for HTTP at 127.0.0.1:5000, +as of Docker 1.3.1 you are required to specify `--insecure-registry 127.0.0.1:5000` when starting +the Docker daemon. + Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be set like this: diff --git a/docs/sources/release-notes.md b/docs/sources/release-notes.md new file mode 100644 index 0000000000000000000000000000000000000000..6b2f0fd57107dec07f4e1ee28cf4764b6d972855 --- /dev/null +++ b/docs/sources/release-notes.md @@ -0,0 +1,291 @@ +page_title: Docker 1.x Series Release Notes page_description: Release Notes for +Docker 1.x. page_keywords: docker, documentation, about, technology, +understanding, release + +#Release Notes + +##Version 1.3.1 +(2014-10-28) + +This release fixes some bugs and addresses some security issues. + +*Security fixes* + +Patches and changes were made to address CVE-2014-5277 and CVE-2014-3566. Specifically, changes were made to: +* Prevent fallback to SSL protocols < TLS 1.0 for client, daemon and registry +* Secure HTTPS connection to registries with certificate verification and without HTTP fallback unless `--insecure-registry` is specified. + +*Runtime fixes* + +* Fixed issue where volumes would not be shared + +*Client fixes* + +* Fixed issue with `--iptables=false` not automatically setting +`--ip-masq=false` +* Fixed docker run output to non-TTY stdout + +*Builder fixes* + +* Fixed escaping `$` for environment variables +* Fixed issue with lowercase `onbuild` Dockerfile instruction + + +##Version 1.3.0 + +This version fixes a number of bugs and issues and adds new functions and other +improvements. The [GitHub 1.3milestone](https://github.com/docker/docker/issues?q=milestone%3A1.3.0+) has +more detailed information. Major additions and changes include: + +###New Features + +*New command: `docker exec`* + +The new `docker exec` command lets you run a process in an existing, active +container. The command has APIs for both the daemon and the client. With `docker +exec`, you'll be able to do things like add or remove devices from running +containers, debug running containers, and run commands that are not part of the +container's static specification. Details in the [command line reference](/reference/commandline/cli/#exec). + +*New command: `docker create`* + +Traditionally, the `docker run` command has been used to both create a container +and spawn a process to run it. The new `docker create` command breaks this +apart, letting you set up a container without actually starting it. This +provides more control over management of the container lifecycle, giving you the +ability to configure things like volumes or port mappings before the container +is started. For example, in a rapid-response scaling situation, you could use +`create` to prepare and stage ten containers in anticipation of heavy loads. +Details in the [command line reference](/reference/commandline/cli/#create). + +*Tech preview of new provenance features* + +This release offers a sneak peek at new image signing capabilities that are +currently under development. Soon, these capabilities will allow any image +author to sign their images to certify they have not been tampered with. For +this release, Official images are now signed by Docker, Inc. Not only does this +demonstrate the new functionality, we hope it will improve your confidence in +the security of Official images. Look for the blue ribbons denoting signed +images on the [Docker Hub](https://hub.docker.com/). The Docker Engine has been +updated to automatically verify that a given Official Repo has a current, valid +signature. When pulling a signed image, you'll see a message stating `the image +you are pulling has been verified`. If no valid signature is detected, Docker +Engine will fall back to pulling a regular, unsigned image. + +###Other improvements & changes* + +* We've added a new security options flag to the `docker run` command, +`--security-opt`, that lets you set SELinux and AppArmor labels and profiles. +This means you'll no longer have to use `docker run --privileged` on kernels +that support SE Linux or AppArmor. For more information, see the [command line +reference](/reference/commandline/cli/#run). + +* A new flag, `--add-host`, has been added to `docker run` that lets you add +lines to `/etc/hosts`. This allows you to specify different name resolution for +the container than it would get via DNS. For more information, see the [command +line reference](/reference/commandline/cli/#run). + +* You can now set a `DOCKER_TLS_VERIFY` environment variable to secure +connections by default (rather than having to pass the `--tlsverify` flag on +every call). For more information, see the [https guide](/articles/https). + +* Three security issues have been addressed in this release: [CVE-2014-5280, +CVE-2014-5270, and +CVE-2014-5282](https://groups.google.com/forum/#!msg/docker-announce/aQoVmQlcE0A/smPuBNYf8VwJ). + +##Version 1.2.0 + +This version fixes a number of bugs and issues and adds new functions and other +improvements. These include: + +###New Features + +*New restart policies* + +We added a `--restart flag` to `docker run` to specify a restart policy for your +container. Currently, there are three policies available: + +* `no` – Do not restart the container if it dies. (default) * `on-failure` – +Restart the container if it exits with a non-zero exit code. This can also +accept an optional maximum restart count (e.g. `on-failure:5`). * `always` – +Always restart the container no matter what exit code is returned. This +deprecates the `--restart` flag on the Docker daemon. + +*New flags for `docker run`: `--cap-add` and `–-cap-drop`* + +In previous releases, Docker containers could either be given complete +capabilities or they could all follow a whitelist of allowed capabilities while +dropping all others. Further, using `--privileged` would grant all capabilities +inside a container, rather than applying a whitelist. This was not recommended +for production use because it’s really unsafe; it’s as if you were directly in +the host. + +This release introduces two new flags for `docker run`, `--cap-add` and +`--cap-drop`, that give you fine-grain control over the specific capabilities +you want grant to a particular container. + +*New `-–device` flag for `docker run`* + +Previously, you could only use devices inside your containers by bind mounting +them (with `-v`) in a `--privileged` container. With this release, we introduce +the `--device flag` to `docker run` which lets you use a device without +requiring a privileged container. + +*Writable `/etc/hosts`, `/etc/hostname` and `/etc/resolv.conf`* + +You can now edit `/etc/hosts`, `/etc/hostname` and `/etc/resolve.conf` in a +running container. This is useful if you need to install BIND or other services +that might override one of those files. + +Note, however, that changes to these files are not saved when running `docker +build` and so will not be preserved in the resulting image. The changes will +only “stick” in a running container. + +*Docker proxy in a separate process* + +The Docker userland proxy that routes outbound traffic to your containers now +has its own separate process (one process per connection). This greatly reduces +the load on the daemon, which increases stability and efficiency. + +###Other improvements & changes + +* When using `docker rm -f`, Docker now kills the container (instead of stopping +it) before removing it . If you intend to stop the container cleanly, you can +use `docker stop`. + +* Added support for IPv6 addresses in `--dns` + +* Added search capability in private registries + +##Version 1.1.0 + +###New Features + +*`.dockerignore` support* + +You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will +ignore files and directories specified in that file when sending the build +context to the daemon. Example: +https://github.com/docker/docker/blob/master/.dockerignore + +*Pause containers during commit* + +Doing a commit on a running container was not recommended because you could end +up with files in an inconsistent state (for example, if they were being written +during the commit). Containers are now paused when a commit is made to them. You +can disable this feature by doing a `docker commit --pause=false ` + +*Tailing logs* + +You can now tail the logs of a container. For example, you can get the last ten +lines of a log by using `docker logs --tail 10 `. You can also +follow the logs of a container without having to read the whole log file with +`docker logs --tail 0 -f `. + +*Allow a tar file as context for docker build* + +You can now pass a tar archive to `docker build` as context. This can be used to +automate docker builds, for example: `cat context.tar | docker build -` or +`docker run builder_image | docker build -` + +*Bind mounting your whole filesystem in a container* + +`/` is now allowed as source of `--volumes`. This means you can bind-mount your +whole system in a container if you need to. For example: `docker run -v +/:/my_host ubuntu:ro ls /my_host`. However, it is now forbidden to mount to /. + + +###Other Improvements & Changes + +* Port allocation has been improved. In the previous release, Docker could +prevent you from starting a container with previously allocated ports which +seemed to be in use when in fact they were not. This has been fixed. + +* A bug in `docker save` was introduced in the last release. The `docker save` +command could produce images with invalid metadata. The command now produces +images with correct metadata. + +* Running `docker inspect` in a container now returns which containers it is +linked to. + +* Parsing of the `docker commit` flag has improved validation, to better prevent +you from committing an image with a name such as `-m`. Image names with dashes +in them potentially conflict with command line flags. + +* The API now has Improved status codes for `start` and `stop`. Trying to start +a running container will now return a 304 error. + +* Performance has been improved overall. Starting the daemon is faster than in +previous releases. The daemon’s performance has also been improved when it is +working with large numbers of images and containers. + +* Fixed an issue with white-spaces and multi-lines in Dockerfiles. + +##Version 1.1.0 + +###New Features + +*`.dockerignore` support* + +You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will +ignore files and directories specified in that file when sending the build +context to the daemon. Example: +https://github.com/dotcloud/docker/blob/master/.dockerignore + +*Pause containers during commit* + +Doing a commit on a running container was not recommended because you could end +up with files in an inconsistent state (for example, if they were being written +during the commit). Containers are now paused when a commit is made to them. You +can disable this feature by doing a `docker commit --pause=false ` + +*Tailing logs* + +You can now tail the logs of a container. For example, you can get the last ten +lines of a log by using `docker logs --tail 10 `. You can also +follow the logs of a container without having to read the whole log file with +`docker logs --tail 0 -f `. + +*Allow a tar file as context for docker build* + +You can now pass a tar archive to `docker build` as context. This can be used to +automate docker builds, for example: `cat context.tar | docker build -` or +`docker run builder_image | docker build -` + +*Bind mounting your whole filesystem in a container* + +`/` is now allowed as source of `--volumes`. This means you can bind-mount your +whole system in a container if you need to. For example: `docker run -v +/:/my_host ubuntu:ro ls /my_host`. However, it is now forbidden to mount to /. + + +###Other Improvements & Changes + +* Port allocation has been improved. In the previous release, Docker could +prevent you from starting a container with previously allocated ports which +seemed to be in use when in fact they were not. This has been fixed. + +* A bug in `docker save` was introduced in the last release. The `docker save` +command could produce images with invalid metadata. The command now produces +images with correct metadata. + +* Running `docker inspect` in a container now returns which containers it is +linked to. + +* Parsing of the `docker commit` flag has improved validation, to better prevent +you from committing an image with a name such as `-m`. Image names with dashes +in them potentially conflict with command line flags. + +* The API now has Improved status codes for `start` and `stop`. Trying to start +a running container will now return a 304 error. + +* Performance has been improved overall. Starting the daemon is faster than in +previous releases. The daemon’s performance has also been improved when it is +working with large numbers of images and containers. + +* Fixed an issue with white-spaces and multi-lines in Dockerfiles. + +##Version 1.0.0 + +First production-ready release. Prior development history can be found by +searching in [GitHub](https://github.com/docker/docker). diff --git a/graph/pull.go b/graph/pull.go index 5d7e84ed72d0a8efb87f16e0ca661e281d3e8d94..897e0813a12d811730bf334191bc911d46030bc0 100644 --- a/graph/pull.go +++ b/graph/pull.go @@ -113,7 +113,9 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status { return job.Error(err) } - endpoint, err := registry.NewEndpoint(hostname) + secure := registry.IsSecure(hostname, s.insecureRegistries) + + endpoint, err := registry.NewEndpoint(hostname, secure) if err != nil { return job.Error(err) } diff --git a/graph/push.go b/graph/push.go index 3511245b307a31a15c913b91e605b6a4378e25ab..1d2bf72422da79544f509eb090717208a2dd046e 100644 --- a/graph/push.go +++ b/graph/push.go @@ -214,7 +214,9 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status { return job.Error(err) } - endpoint, err := registry.NewEndpoint(hostname) + secure := registry.IsSecure(hostname, s.insecureRegistries) + + endpoint, err := registry.NewEndpoint(hostname, secure) if err != nil { return job.Error(err) } diff --git a/graph/tags.go b/graph/tags.go index 31c65ced5c168f512a14034bcc552ebae162856f..622d620941ae7fadf6e4847522a01fe7330fc323 100644 --- a/graph/tags.go +++ b/graph/tags.go @@ -23,10 +23,11 @@ var ( ) type TagStore struct { - path string - graph *Graph - mirrors []string - Repositories map[string]Repository + path string + graph *Graph + mirrors []string + insecureRegistries []string + Repositories map[string]Repository sync.Mutex // FIXME: move push/pull-related fields // to a helper type @@ -54,18 +55,20 @@ func (r Repository) Contains(u Repository) bool { return true } -func NewTagStore(path string, graph *Graph, mirrors []string) (*TagStore, error) { +func NewTagStore(path string, graph *Graph, mirrors []string, insecureRegistries []string) (*TagStore, error) { abspath, err := filepath.Abs(path) if err != nil { return nil, err } + store := &TagStore{ - path: abspath, - graph: graph, - mirrors: mirrors, - Repositories: make(map[string]Repository), - pullingPool: make(map[string]chan struct{}), - pushingPool: make(map[string]chan struct{}), + path: abspath, + graph: graph, + mirrors: mirrors, + insecureRegistries: insecureRegistries, + Repositories: make(map[string]Repository), + pullingPool: make(map[string]chan struct{}), + pushingPool: make(map[string]chan struct{}), } // Load the json file if it exists, otherwise create it. if err := store.reload(); os.IsNotExist(err) { diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go index e4f1fb809fd8be364d6907fe7c924156179caed6..da512547d549d1d1cc2319fb30f5877a5b0a43e3 100644 --- a/graph/tags_unit_test.go +++ b/graph/tags_unit_test.go @@ -53,7 +53,7 @@ func mkTestTagStore(root string, t *testing.T) *TagStore { if err != nil { t.Fatal(err) } - store, err := NewTagStore(path.Join(root, "tags"), graph, nil) + store, err := NewTagStore(path.Join(root, "tags"), graph, nil, nil) if err != nil { t.Fatal(err) } diff --git a/hack/release.sh b/hack/release.sh index da832e8bb893a41794672ebd953b38d6a8144131..1174e0cc4cf7aeda4698308454db0a8438d737cc 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -270,7 +270,7 @@ EOF done # Upload keys - s3cmd sync /.gnupg/ s3://$BUCKET/ubuntu/.gnupg/ + s3cmd sync $HOME/.gnupg/ s3://$BUCKET/ubuntu/.gnupg/ gpg --armor --export releasedocker > bundles/$VERSION/ubuntu/gpg s3cmd --acl-public put bundles/$VERSION/ubuntu/gpg s3://$BUCKET/gpg @@ -355,8 +355,8 @@ release_test() { setup_gpg() { # Make sure that we have our keys - mkdir -p /.gnupg/ - s3cmd sync s3://$BUCKET/ubuntu/.gnupg/ /.gnupg/ || true + mkdir -p $HOME/.gnupg/ + s3cmd sync s3://$BUCKET/ubuntu/.gnupg/ $HOME/.gnupg/ || true gpg --list-keys releasedocker >/dev/null || { gpg --gen-key --batch <