Bump version to v1.7.0

Signed-off-by: Jessica Frazelle <princess@docker.com>
2026-08-19 12:16:30 +00:00 · 2015-06-15 17:32:17 -07:00
133 changed files with 1729 additions and 2393 deletions
@@ -1,35 +1,11 @@
 # Changelog

-## 1.7.1 (2015-07-02)
-
-#### Runtime
-
- Fix default user spawning exec process with `docker exec`
- Make `--bridge=none` to not configure the network bridge
- Publish networking stats properly
- Fix implicit devicemapper selection with static binaries
- Fix socket connections that hanged internitently
- Fix bridge interface creation on CentOS/RHEL 6.6
- Fix local dns lookups added to resolv.conf
- Fix copy command mounting volumes
-
-#### Remote API
-
- Fix unmarshalling of Command and Entrypoint
- Set limit for minimum client version supported
- Validate port specification
- Return proper errors when attach/reattach fail
-
-#### Distribution
-
- Fix pulling private images
- Fix fallback between registry V2 and V1
-
-
 ## 1.7.0 (2015-06-16)

 #### Runtime
 + Experimental feature: support for out-of-process volume plugins
+ Experimental feature: support for out-of-process network plugins
+* Logging: syslog logging driver is available
 * The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
 * The `exec` command supports the `-u|--user` flag to specify the new process owner
 + Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags
@@ -4,7 +4,7 @@ Want to hack on Docker? Awesome!  We have a contributor's guide that explains
 [setting up a Docker development environment and the contribution
 process](https://docs.docker.com/project/who-written-for/). 

-![Contributors guide](docs/static_files/contributors.png)
+![Contributors guide](docs/sources/static_files/contributors.png)

 This page contains information about reporting issues as well as some tips and
 guidelines useful to experienced open source contributors. Finally, make sure
@@ -18,7 +18,7 @@ It benefits directly from the experience accumulated over several years
 of large-scale operation and support of hundreds of thousands of
 applications and databases.

-![Docker L](docs/static_files/docker-logo-compressed.png "Docker")
+![Docker L](docs/sources/static_files/docker-logo-compressed.png "Docker")

 ## Security Disclosure

@@ -1 +1 @@
-1.7.1-rc2
+1.7.0-rc4
@@ -138,7 +138,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
 	if err != nil {
 		return err
 	}
-	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", api.Version, path), params)
+	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", api.APIVERSION, path), params)
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func (cli *DockerCli) clientRequest(method, path string, in io.Reader, headers m
 	if expectedPayload && in == nil {
 		in = bytes.NewReader([]byte{})
 	}
-	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", api.Version, path), in)
+	req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", api.APIVERSION, path), in)
 	if err != nil {
 		return nil, "", -1, err
 	}
@@ -26,7 +26,7 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
 	if dockerversion.VERSION != "" {
 		fmt.Fprintf(cli.out, "Client version: %s\n", dockerversion.VERSION)
 	}
-	fmt.Fprintf(cli.out, "Client API version: %s\n", api.Version)
+	fmt.Fprintf(cli.out, "Client API version: %s\n", api.APIVERSION)
 	fmt.Fprintf(cli.out, "Go version (client): %s\n", runtime.Version())
 	if dockerversion.GITCOMMIT != "" {
 		fmt.Fprintf(cli.out, "Git commit (client): %s\n", dockerversion.GITCOMMIT)
@@ -16,14 +16,8 @@ import (

 // Common constants for daemon and client.
 const (
-	// Current REST API version
-	Version version.Version = "1.19"
-
-	// Minimun REST API version supported
-	MinVersion version.Version = "1.12"
-
-	// Default filename with Docker commands, read by docker build
-	DefaultDockerfileName string = "Dockerfile"
+	APIVERSION            version.Version = "1.19"       // Current REST API version
+	DefaultDockerfileName string          = "Dockerfile" // Default filename with Docker commands, read by docker build
 )

 type ByPrivatePort []types.Port
@@ -247,7 +247,7 @@ func (s *Server) postAuth(version version.Version, w http.ResponseWriter, r *htt
 func (s *Server) getVersion(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	v := &types.Version{
 		Version:    dockerversion.VERSION,
-		ApiVersion: api.Version,
+		ApiVersion: api.APIVERSION,
 		GitCommit:  dockerversion.GITCOMMIT,
 		GoVersion:  runtime.Version(),
 		Os:         runtime.GOOS,
@@ -903,7 +903,6 @@ func (s *Server) postContainersCreate(version version.Version, w http.ResponseWr
 	if err != nil {
 		return err
 	}
-	adjustCpuShares(version, hostConfig)

 	containerId, warnings, err := s.daemon.ContainerCreate(name, config, hostConfig)
 	if err != nil {
@@ -1101,11 +1100,6 @@ func (s *Server) postContainersAttach(version version.Version, w http.ResponseWr
 		return fmt.Errorf("Missing parameter")
 	}

-	cont, err := s.daemon.Get(vars["name"])
-	if err != nil {
-		return err
-	}
-
 	inStream, outStream, err := hijackServer(w)
 	if err != nil {
 		return err
@@ -1129,7 +1123,7 @@ func (s *Server) postContainersAttach(version version.Version, w http.ResponseWr
 		Multiplex: version.GreaterThanOrEqualTo("1.6"),
 	}

-	if err := s.daemon.ContainerAttachWithLogs(cont, attachWithLogsConfig); err != nil {
+	if err := s.daemon.ContainerAttachWithLogs(vars["name"], attachWithLogsConfig); err != nil {
 		fmt.Fprintf(outStream, "Error attaching: %s\n", err)
 	}

@@ -1144,11 +1138,6 @@ func (s *Server) wsContainersAttach(version version.Version, w http.ResponseWrit
 		return fmt.Errorf("Missing parameter")
 	}

-	cont, err := s.daemon.Get(vars["name"])
-	if err != nil {
-		return err
-	}
-
 	h := websocket.Handler(func(ws *websocket.Conn) {
 		defer ws.Close()

@@ -1160,7 +1149,7 @@ func (s *Server) wsContainersAttach(version version.Version, w http.ResponseWrit
 			Stream:    boolValue(r, "stream"),
 		}

-		if err := s.daemon.ContainerWsAttachWithLogs(cont, wsAttachWithLogsConfig); err != nil {
+		if err := s.daemon.ContainerWsAttachWithLogs(vars["name"], wsAttachWithLogsConfig); err != nil {
 			logrus.Errorf("Error attaching websocket: %s", err)
 		}
 	})
@@ -1217,17 +1206,18 @@ func (s *Server) getImagesByName(version version.Version, w http.ResponseWriter,

 func (s *Server) postBuild(version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
 	var (
-		authConfigs        = map[string]cliconfig.AuthConfig{}
-		authConfigsEncoded = r.Header.Get("X-Registry-Config")
-		buildConfig        = builder.NewBuildConfig()
+		authConfig        = &cliconfig.AuthConfig{}
+		configFileEncoded = r.Header.Get("X-Registry-Config")
+		configFile        = &cliconfig.ConfigFile{}
+		buildConfig       = builder.NewBuildConfig()
 	)

-	if authConfigsEncoded != "" {
-		authConfigsJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authConfigsEncoded))
-		if err := json.NewDecoder(authConfigsJSON).Decode(&authConfigs); err != nil {
+	if configFileEncoded != "" {
+		configFileJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(configFileEncoded))
+		if err := json.NewDecoder(configFileJson).Decode(configFile); err != nil {
 			// for a pull it is not an error if no auth was given
-			// to increase compatibility with the existing api it is defaulting
-			// to be empty.
+			// to increase compatibility with the existing api it is defaulting to be empty
+			configFile = &cliconfig.ConfigFile{}
 		}
 	}

@@ -1254,7 +1244,8 @@ func (s *Server) postBuild(version version.Version, w http.ResponseWriter, r *ht
 	buildConfig.SuppressOutput = boolValue(r, "q")
 	buildConfig.NoCache = boolValue(r, "nocache")
 	buildConfig.ForceRemove = boolValue(r, "forcerm")
-	buildConfig.AuthConfigs = authConfigs
+	buildConfig.AuthConfig = authConfig
+	buildConfig.ConfigFile = configFile
 	buildConfig.MemorySwap = int64ValueOrZero(r, "memswap")
 	buildConfig.Memory = int64ValueOrZero(r, "memory")
 	buildConfig.CpuShares = int64ValueOrZero(r, "cpushares")
@@ -1483,18 +1474,14 @@ func makeHttpHandler(logging bool, localMethod string, localRoute string, handle
 		}
 		version := version.Version(mux.Vars(r)["version"])
 		if version == "" {
-			version = api.Version
+			version = api.APIVERSION
 		}
 		if corsHeaders != "" {
 			writeCorsHeaders(w, r, corsHeaders)
 		}

-		if version.GreaterThan(api.Version) {
-			http.Error(w, fmt.Errorf("client is newer than server (client API version: %s, server API version: %s)", version, api.Version).Error(), http.StatusBadRequest)
-			return
-		}
-		if version.LessThan(api.MinVersion) {
-			http.Error(w, fmt.Errorf("client is too old, minimum supported API version is %s, please upgrade your client to a newer version", api.MinVersion).Error(), http.StatusBadRequest)
+		if version.GreaterThan(api.APIVERSION) {
+			http.Error(w, fmt.Errorf("client and server don't have same version (client API version: %s, server API version: %s)", version, api.APIVERSION).Error(), http.StatusBadRequest)
 			return
 		}

@@ -8,21 +8,12 @@ import (
 	"net/http"
 	"strconv"

-	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/pkg/sockets"
 	"github.com/docker/docker/pkg/systemd"
-	"github.com/docker/docker/pkg/version"
-	"github.com/docker/docker/runconfig"
 	"github.com/docker/libnetwork/portallocator"
 )

-const (
-	// See http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269
-	linuxMinCpuShares = 2
-	linuxMaxCpuShares = 262144
-)
-
 // newServer sets up the required serverClosers and does protocol specific checking.
 func (s *Server) newServer(proto, addr string) ([]serverCloser, error) {
 	var (
@@ -105,18 +96,3 @@ func allocateDaemonPort(addr string) error {
 	}
 	return nil
 }
-
-func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig) {
-	if version.LessThan("1.19") {
-		if hostConfig.CpuShares > 0 {
-			// Handle unsupported CpuShares
-			if hostConfig.CpuShares < linuxMinCpuShares {
-				logrus.Warnf("Changing requested CpuShares of %d to minimum allowed of %d", hostConfig.CpuShares, linuxMinCpuShares)
-				hostConfig.CpuShares = linuxMinCpuShares
-			} else if hostConfig.CpuShares > linuxMaxCpuShares {
-				logrus.Warnf("Changing requested CpuShares of %d to maximum allowed of %d", hostConfig.CpuShares, linuxMaxCpuShares)
-				hostConfig.CpuShares = linuxMaxCpuShares
-			}
-		}
-	}
-}
@@ -1,68 +0,0 @@
-// +build linux
-
-package server
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/version"
-	"github.com/docker/docker/runconfig"
-)
-
-func TestAdjustCpuSharesOldApi(t *testing.T) {
-	apiVersion := version.Version("1.18")
-	hostConfig := &runconfig.HostConfig{
-		CpuShares: linuxMinCpuShares - 1,
-	}
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != linuxMinCpuShares {
-		t.Errorf("Expected CpuShares to be %d", linuxMinCpuShares)
-	}
-
-	hostConfig.CpuShares = linuxMaxCpuShares + 1
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != linuxMaxCpuShares {
-		t.Errorf("Expected CpuShares to be %d", linuxMaxCpuShares)
-	}
-
-	hostConfig.CpuShares = 0
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != 0 {
-		t.Error("Expected CpuShares to be unchanged")
-	}
-
-	hostConfig.CpuShares = 1024
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != 1024 {
-		t.Error("Expected CpuShares to be unchanged")
-	}
-}
-
-func TestAdjustCpuSharesNoAdjustment(t *testing.T) {
-	apiVersion := version.Version("1.19")
-	hostConfig := &runconfig.HostConfig{
-		CpuShares: linuxMinCpuShares - 1,
-	}
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != linuxMinCpuShares-1 {
-		t.Errorf("Expected CpuShares to be %d", linuxMinCpuShares-1)
-	}
-
-	hostConfig.CpuShares = linuxMaxCpuShares + 1
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != linuxMaxCpuShares+1 {
-		t.Errorf("Expected CpuShares to be %d", linuxMaxCpuShares+1)
-	}
-
-	hostConfig.CpuShares = 0
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != 0 {
-		t.Error("Expected CpuShares to be unchanged")
-	}
-
-	hostConfig.CpuShares = 1024
-	adjustCpuShares(apiVersion, hostConfig)
-	if hostConfig.CpuShares != 1024 {
-		t.Error("Expected CpuShares to be unchanged")
-	}
-}
@@ -48,6 +48,3 @@ func (s *Server) AcceptConnections(d *daemon.Daemon) {
 func allocateDaemonPort(addr string) error {
 	return nil
 }
-
-func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig) {
-}
@@ -98,8 +98,8 @@ type Builder struct {
 	// the final configs of the Dockerfile but dont want the layers
 	disableCommit bool

-	// Registry server auth configs used to pull images when handling `FROM`.
-	AuthConfigs map[string]cliconfig.AuthConfig
+	AuthConfig *cliconfig.AuthConfig
+	ConfigFile *cliconfig.ConfigFile

 	// Deprecated, original writer used for ImagePull. To be removed.
 	OutOld          io.Writer
@@ -21,7 +21,6 @@ import (

 	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/builder/parser"
-	"github.com/docker/docker/cliconfig"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/graph"
 	imagepkg "github.com/docker/docker/image"
@@ -447,19 +446,15 @@ func (b *Builder) pullImage(name string) (*imagepkg.Image, error) {
 		tag = "latest"
 	}

-	pullRegistryAuth := &cliconfig.AuthConfig{}
-	if len(b.AuthConfigs) > 0 {
+	pullRegistryAuth := b.AuthConfig
+	if len(b.ConfigFile.AuthConfigs) > 0 {
 		// The request came with a full auth config file, we prefer to use that
 		repoInfo, err := b.Daemon.RegistryService.ResolveRepository(remote)
 		if err != nil {
 			return nil, err
 		}
-
-		resolvedConfig := registry.ResolveAuthConfig(
-			&cliconfig.ConfigFile{AuthConfigs: b.AuthConfigs},
-			repoInfo.Index,
-		)
-		pullRegistryAuth = &resolvedConfig
+		resolvedAuth := registry.ResolveAuthConfig(b.ConfigFile, repoInfo.Index)
+		pullRegistryAuth = &resolvedAuth
 	}

 	imagePullConfig := &graph.ImagePullConfig{
@@ -53,7 +53,8 @@ type Config struct {
 	CpuSetCpus     string
 	CpuSetMems     string
 	CgroupParent   string
-	AuthConfigs    map[string]cliconfig.AuthConfig
+	AuthConfig     *cliconfig.AuthConfig
+	ConfigFile     *cliconfig.ConfigFile

 	Stdout  io.Writer
 	Context io.ReadCloser
@@ -78,8 +79,9 @@ func (b *Config) WaitCancelled() <-chan struct{} {

 func NewBuildConfig() *Config {
 	return &Config{
-		AuthConfigs: map[string]cliconfig.AuthConfig{},
-		cancelled:   make(chan struct{}),
+		AuthConfig: &cliconfig.AuthConfig{},
+		ConfigFile: &cliconfig.ConfigFile{},
+		cancelled:  make(chan struct{}),
 	}
 }

@@ -158,7 +160,8 @@ func Build(d *daemon.Daemon, buildConfig *Config) error {
 		Pull:            buildConfig.Pull,
 		OutOld:          buildConfig.Stdout,
 		StreamFormatter: sf,
-		AuthConfigs:     buildConfig.AuthConfigs,
+		AuthConfig:      buildConfig.AuthConfig,
+		ConfigFile:      buildConfig.ConfigFile,
 		dockerfileName:  buildConfig.DockerfileName,
 		cpuShares:       buildConfig.CpuShares,
 		cpuPeriod:       buildConfig.CpuPeriod,
@@ -5,7 +5,6 @@
 FROM centos:7

 RUN yum groupinstall -y "Development Tools"
-RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar

 ENV GO_VERSION 1.4.2
@@ -38,10 +38,6 @@ for version in "${versions[@]}"; do
 		centos:*)
 			# get "Development Tools" packages dependencies
 			echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile"
-
-			if [[ "$version" == "centos-7" ]]; then
-				echo 'RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs' >> "$version/Dockerfile"
-			fi
 			;;
 		*)
 			echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile"
@@ -14,7 +14,12 @@ type ContainerAttachWithLogsConfig struct {
 	Multiplex                      bool
 }

-func (daemon *Daemon) ContainerAttachWithLogs(container *Container, c *ContainerAttachWithLogsConfig) error {
+func (daemon *Daemon) ContainerAttachWithLogs(name string, c *ContainerAttachWithLogsConfig) error {
+	container, err := daemon.Get(name)
+	if err != nil {
+		return err
+	}
+
 	var errStream io.Writer

 	if !container.Config.Tty && c.Multiplex {
@@ -46,6 +51,11 @@ type ContainerWsAttachWithLogsConfig struct {
 	Logs, Stream         bool
 }

-func (daemon *Daemon) ContainerWsAttachWithLogs(container *Container, c *ContainerWsAttachWithLogsConfig) error {
+func (daemon *Daemon) ContainerWsAttachWithLogs(name string, c *ContainerWsAttachWithLogsConfig) error {
+	container, err := daemon.Get(name)
+	if err != nil {
+		return err
+	}
+
 	return container.AttachWithLogs(c.InStream, c.OutStream, c.ErrStream, c.Logs, c.Stream)
 }
@@ -14,24 +14,24 @@ const (
 // CommonConfig defines the configuration of a docker daemon which are
 // common across platforms.
 type CommonConfig struct {
-	AutoRestart   bool
-	Context       map[string][]string
-	CorsHeaders   string
-	DisableBridge bool
-	Dns           []string
-	DnsSearch     []string
-	EnableCors    bool
-	ExecDriver    string
-	ExecOptions   []string
-	ExecRoot      string
-	GraphDriver   string
-	GraphOptions  []string
-	Labels        []string
-	LogConfig     runconfig.LogConfig
-	Mtu           int
-	Pidfile       string
-	Root          string
-	TrustKeyPath  string
+	AutoRestart    bool
+	Context        map[string][]string
+	CorsHeaders    string
+	DisableNetwork bool
+	Dns            []string
+	DnsSearch      []string
+	EnableCors     bool
+	ExecDriver     string
+	ExecOptions    []string
+	ExecRoot       string
+	GraphDriver    string
+	GraphOptions   []string
+	Labels         []string
+	LogConfig      runconfig.LogConfig
+	Mtu            int
+	Pidfile        string
+	Root           string
+	TrustKeyPath   string
 }

 // InstallCommonFlags adds command-line options to the top-level flag parser for
@@ -24,7 +24,6 @@ import (
 	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/broadcastwriter"
-	"github.com/docker/docker/pkg/fileutils"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/jsonlog"
 	"github.com/docker/docker/pkg/mount"
@@ -600,20 +599,11 @@ func (container *Container) Copy(resource string) (io.ReadCloser, error) {
 		return nil, err
 	}
 	for _, m := range mounts {
-		var dest string
-		dest, err = container.GetResourcePath(m.Destination)
+		dest, err := container.GetResourcePath(m.Destination)
 		if err != nil {
 			return nil, err
 		}
-		var stat os.FileInfo
-		stat, err = os.Stat(m.Source)
-		if err != nil {
-			return nil, err
-		}
-		if err = fileutils.CreateIfNotExists(dest, stat.IsDir()); err != nil {
-			return nil, err
-		}
-		if err = mount.Mount(m.Source, dest, "bind", "rbind,ro"); err != nil {
+		if err := mount.Mount(m.Source, dest, "bind", "rbind,ro"); err != nil {
 			return nil, err
 		}
 	}
@@ -469,7 +469,7 @@ func (container *Container) buildJoinOptions() ([]libnetwork.EndpointOption, err
 			logrus.Error(err)
 		}

-		if c != nil && !container.daemon.config.DisableBridge && container.hostConfig.NetworkMode.IsPrivate() {
+		if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {
 			logrus.Debugf("Update /etc/hosts of %s for alias %s with ip %s", c.ID, ref.Name, container.NetworkSettings.IPAddress)
 			joinOptions = append(joinOptions, libnetwork.JoinOptionParentUpdate(c.NetworkSettings.EndpointID, ref.Name, container.NetworkSettings.IPAddress))
 			if c.NetworkSettings.EndpointID != "" {
@@ -753,11 +753,6 @@ func (container *Container) AllocateNetwork() error {
 		return nil
 	}

-	if mode.IsBridge() && container.daemon.config.DisableBridge {
-		container.Config.NetworkDisabled = true
-		return nil
-	}
-
 	var err error

 	n, err := container.daemon.netController.NetworkByName(string(mode))
@@ -822,6 +817,10 @@ func (container *Container) initializeNetworking() error {
 		return nil
 	}

+	if container.daemon.config.DisableNetwork {
+		container.Config.NetworkDisabled = true
+	}
+
 	if container.hostConfig.NetworkMode.IsHost() {
 		container.Config.Hostname, err = os.Hostname()
 		if err != nil {
@@ -940,7 +939,7 @@ func (container *Container) getNetworkedContainer() (*Container, error) {
 }

 func (container *Container) ReleaseNetwork() {
-	if container.hostConfig.NetworkMode.IsContainer() || container.Config.NetworkDisabled {
+	if container.hostConfig.NetworkMode.IsContainer() || container.daemon.config.DisableNetwork {
 		return
 	}

@@ -32,7 +32,6 @@ import (
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/graph"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/broadcastwriter"
 	"github.com/docker/docker/pkg/fileutils"
@@ -683,7 +682,7 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 	if !config.Bridge.EnableIPTables && config.Bridge.EnableIPMasq {
 		config.Bridge.EnableIPMasq = false
 	}
-	config.DisableBridge = config.Bridge.Iface == disableNetworkBridge
+	config.DisableNetwork = config.Bridge.Iface == disableNetworkBridge

 	// Check that the system is supported and we have sufficient privileges
 	if runtime.GOOS != "linux" {
@@ -820,9 +819,11 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 		return nil, fmt.Errorf("Couldn't create Tag store: %s", err)
 	}

-	d.netController, err = initNetworkController(config)
-	if err != nil {
-		return nil, fmt.Errorf("Error initializing network controller: %v", err)
+	if !config.DisableNetwork {
+		d.netController, err = initNetworkController(config)
+		if err != nil {
+			return nil, fmt.Errorf("Error initializing network controller: %v", err)
+		}
 	}

 	graphdbPath := path.Join(config.Root, "linkgraph.db")
@@ -910,22 +911,12 @@ func initNetworkController(config *Config) (libnetwork.NetworkController, error)
 		return nil, fmt.Errorf("Error creating default \"host\" network: %v", err)
 	}

-	if !config.DisableBridge {
-		// Initialize default driver "bridge"
-		if err := initBridgeDriver(controller, config); err != nil {
-			return nil, err
-		}
-	}
-
-	return controller, nil
-}
-
-func initBridgeDriver(controller libnetwork.NetworkController, config *Config) error {
+	// Initialize default driver "bridge"
 	option := options.Generic{
 		"EnableIPForwarding": config.Bridge.EnableIPForward}

 	if err := controller.ConfigureNetworkDriver("bridge", options.Generic{netlabel.GenericData: option}); err != nil {
-		return fmt.Errorf("Error initializing bridge driver: %v", err)
+		return nil, fmt.Errorf("Error initializing bridge driver: %v", err)
 	}

 	netOption := options.Generic{
@@ -940,7 +931,7 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
 	if config.Bridge.IP != "" {
 		ip, bipNet, err := net.ParseCIDR(config.Bridge.IP)
 		if err != nil {
-			return err
+			return nil, err
 		}

 		bipNet.IP = ip
@@ -950,7 +941,7 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
 	if config.Bridge.FixedCIDR != "" {
 		_, fCIDR, err := net.ParseCIDR(config.Bridge.FixedCIDR)
 		if err != nil {
-			return err
+			return nil, err
 		}

 		netOption["FixedCIDR"] = fCIDR
@@ -959,7 +950,7 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
 	if config.Bridge.FixedCIDRv6 != "" {
 		_, fCIDRv6, err := net.ParseCIDR(config.Bridge.FixedCIDRv6)
 		if err != nil {
-			return err
+			return nil, err
 		}

 		netOption["FixedCIDRv6"] = fCIDRv6
@@ -979,15 +970,16 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *Config) e
 	}

 	// Initialize default network on "bridge" with the same name
-	_, err := controller.NewNetwork("bridge", "bridge",
+	_, err = controller.NewNetwork("bridge", "bridge",
 		libnetwork.NetworkOptionGeneric(options.Generic{
 			netlabel.GenericData: netOption,
 			netlabel.EnableIPv6:  config.Bridge.EnableIPv6,
 		}))
 	if err != nil {
-		return fmt.Errorf("Error creating default \"bridge\" network: %v", err)
+		return nil, fmt.Errorf("Error creating default \"bridge\" network: %v", err)
 	}
-	return nil
+
+	return controller, nil
 }

 func (daemon *Daemon) Shutdown() error {
@@ -1198,13 +1190,6 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri
 		return warnings, nil
 	}

-	for port := range hostConfig.PortBindings {
-		_, portStr := nat.SplitProtoPort(string(port))
-		if _, err := nat.ParsePort(portStr); err != nil {
-			return warnings, fmt.Errorf("Invalid port specification: %s", portStr)
-		}
-	}
-
 	if hostConfig.LxcConf.Len() > 0 && !strings.Contains(daemon.ExecutionDriver().Name(), "lxc") {
 		return warnings, fmt.Errorf("Cannot use --lxc-conf with execdriver: %s", daemon.ExecutionDriver().Name())
 	}
@@ -109,6 +109,7 @@ func (d *Daemon) getActiveContainer(name string) (*Container, error) {
 }

 func (d *Daemon) ContainerExecCreate(config *runconfig.ExecConfig) (string, error) {
+
 	// Not all drivers support Exec (LXC for example)
 	if err := checkExecSupport(d.execDriver.Name()); err != nil {
 		return "", err
@@ -122,16 +123,11 @@ func (d *Daemon) ContainerExecCreate(config *runconfig.ExecConfig) (string, erro
 	cmd := runconfig.NewCommand(config.Cmd...)
 	entrypoint, args := d.getEntrypointAndArgs(runconfig.NewEntrypoint(), cmd)

-	user := config.User
-	if len(user) == 0 {
-		user = container.Config.User
-	}
-
 	processConfig := execdriver.ProcessConfig{
 		Tty:        config.Tty,
 		Entrypoint: entrypoint,
 		Arguments:  args,
-		User:       user,
+		User:       config.User,
 	}

 	execConfig := &execConfig{
@@ -104,8 +104,8 @@ type DeviceSet struct {
 	thinpBlockSize        uint32
 	thinPoolDevice        string
 	Transaction           `json:"-"`
-	deferredRemove        bool // use deferred removal
 	overrideUdevSyncCheck bool
+	deferredRemove        bool // use deferred removal
 }

 type DiskUsage struct {
@@ -1033,7 +1033,10 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error {

 	// https://github.com/docker/docker/issues/4036
 	if supported := devicemapper.UdevSetSyncSupport(true); !supported {
-		logrus.Warn("Udev sync is not supported. This will lead to unexpected behavior, data loss and errors. For more information, see https://docs.docker.com/reference/commandline/cli/#daemon-storage-driver-option")
+		logrus.Errorf("Udev sync is not supported. This will lead to unexpected behavior, data loss and errors. For more information, see https://docs.docker.com/reference/commandline/cli/#daemon-storage-driver-option")
+		if !devices.overrideUdevSyncCheck {
+			return graphdriver.ErrNotSupported
+		}
 	}

 	if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) {
@@ -168,7 +168,7 @@ func scanPriorDrivers(root string) []string {
 	priorDrivers := []string{}
 	for driver := range drivers {
 		p := filepath.Join(root, driver)
-		if _, err := os.Stat(p); err == nil && driver != "vfs" {
+		if _, err := os.Stat(p); err == nil {
 			priorDrivers = append(priorDrivers, driver)
 		}
 	}
@@ -8,7 +8,6 @@ import (
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/libcontainer"
 	"github.com/docker/libcontainer/cgroups"
-	"github.com/docker/libnetwork/sandbox"
 )

 func (daemon *Daemon) ContainerStats(name string, stream bool, out io.Writer) error {
@@ -20,10 +19,6 @@ func (daemon *Daemon) ContainerStats(name string, stream bool, out io.Writer) er
 	var preCpuStats types.CpuStats
 	getStat := func(v interface{}) *types.Stats {
 		update := v.(*execdriver.ResourceStats)
-		// Retrieve the nw statistics from libnetwork and inject them in the Stats
-		if nwStats, err := daemon.getNetworkStats(name); err == nil {
-			update.Stats.Interfaces = nwStats
-		}
 		ss := convertToAPITypes(update.Stats)
 		ss.PreCpuStats = preCpuStats
 		ss.MemoryStats.Limit = uint64(update.MemoryLimit)
@@ -123,46 +118,3 @@ func copyBlkioEntry(entries []cgroups.BlkioStatEntry) []types.BlkioStatEntry {
 	}
 	return out
 }
-
-func (daemon *Daemon) getNetworkStats(name string) ([]*libcontainer.NetworkInterface, error) {
-	var list []*libcontainer.NetworkInterface
-
-	c, err := daemon.Get(name)
-	if err != nil {
-		return list, err
-	}
-
-	nw, err := daemon.netController.NetworkByID(c.NetworkSettings.NetworkID)
-	if err != nil {
-		return list, err
-	}
-	ep, err := nw.EndpointByID(c.NetworkSettings.EndpointID)
-	if err != nil {
-		return list, err
-	}
-
-	stats, err := ep.Statistics()
-	if err != nil {
-		return list, err
-	}
-
-	// Convert libnetwork nw stats into libcontainer nw stats
-	for ifName, ifStats := range stats {
-		list = append(list, convertLnNetworkStats(ifName, ifStats))
-	}
-
-	return list, nil
-}
-
-func convertLnNetworkStats(name string, stats *sandbox.InterfaceStatistics) *libcontainer.NetworkInterface {
-	n := &libcontainer.NetworkInterface{Name: name}
-	n.RxBytes = stats.RxBytes
-	n.RxPackets = stats.RxPackets
-	n.RxErrors = stats.RxErrors
-	n.RxDropped = stats.RxDropped
-	n.TxBytes = stats.TxBytes
-	n.TxPackets = stats.TxPackets
-	n.TxErrors = stats.TxErrors
-	n.TxDropped = stats.TxDropped
-	return n
-}
@@ -4,10 +4,21 @@ MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 # To get the git info for this repo
 COPY . /src

-COPY . /docs/content/
+COPY . /docs/content/engine/

-WORKDIR /docs/content
-
-RUN /docs/content/touch-up.sh
-
-WORKDIR /docs
+# Sed to process GitHub Markdown
+# 1-2 Remove comment code from metadata block
+# 3 Remove .md extension from link text
+# 4 Change ](/ to ](/project/ in links
+# 5 Change ](word) to ](/project/word)
+# 6 Change ](../../ to ](/project/
+# 7 Change ](../ to ](/project/word)
+# 
+# 
+RUN find /docs/content/engine -type f -name "*.md" -exec sed -i.old \
+    -e '/^<!.*metadata]>/g' \
+    -e '/^<!.*end-metadata.*>/g' \
+    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
+    -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/engine\//g' \
+    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/engine\/\2/g' \
+    -e 's/\(\][(]\)\(\.\.\/\)/\1\/engine\//g' {} \;
@@ -6,7 +6,7 @@ draft = true

 # Docker Documentation

-The source for Docker documentation is in this directory. Our
+The source for Docker documentation is in this directory under `sources/`. Our
 documentation uses extended Markdown, as implemented by
 [MkDocs](http://mkdocs.org).  The current release of the Docker documentation
 resides on [https://docs.docker.com](https://docs.docker.com).
@@ -60,7 +60,7 @@ own.
 	release. It also allows docs maintainers to easily cherry-pick your changes
 	into the `docs` release branch. 

-4. Modify existing or add new `.md` files to the `docs` directory.
+4. Modify existing or add new `.md` files to the `docs/sources` directory.

 	If you add a new document (`.md`) file, you must also add it to the
 	appropriate section of the `docs/mkdocs.yml` file in this repository.
@@ -113,7 +113,7 @@ links that are referenced in the documentation&mdash;there should be none.
 ## Style guide

 If you have questions about how to write for Docker's documentation, please see
-the [style guide](project/doc-style.md). The style guide provides
+the [style guide](sources/project/doc-style.md). The style guide provides
 guidance about grammar, syntax, formatting, styling, language, or tone. If
 something isn't clear in the guide, please submit an issue to let us know or
 submit a pull request to help us improve it.
@@ -47,9 +47,7 @@ image cache.
 > characters of the full image ID - which can be found using
 > `docker inspect` or `docker images --no-trunc=true`

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}

 ## Running an interactive shell

@@ -4,8 +4,7 @@ title = "Using certificates for repository client verification"
 description = "How to set up and use certificates with a registry to verify access"
 keywords = ["Usage, registry, repository, client, root, certificate, docker, apache, ssl, tls, documentation, examples, articles,  tutorials"]
 [menu.main]
-parent = "mn_docker_hub"
-weight = 7
+parent = "smn_registry"
 +++
 <![end-metadata]-->

@@ -9,7 +9,7 @@ so my process is

 $ boot2docker ssh
 $$ git clone https://github.com/docker/docker
-$$ cd docker/docs/articles/https
+$$ cd docker/docs/sources/articles/https
 $$ make cert
 lots of things to see and manually answer, as openssl wants to be interactive
 **NOTE:** make sure you enter the hostname (`boot2docker` in my case) when prompted for `Computer Name`)
@@ -18,7 +18,7 @@ $$ sudo make run
 start another terminal

 $ boot2docker ssh
-$$ cd docker/docs/articles/https
+$$ cd docker/docs/sources/articles/https
 $$ make client

 the last will connect first with `--tls` and then with `--tlsverify`
@@ -4,8 +4,7 @@ title = "Run a local registry mirror"
 description = "How to set up and run a local registry mirror"
 keywords = ["docker, registry, mirror,  examples"]
 [menu.main]
-parent = "mn_docker_hub"
-weight = 8
+parent = "smn_registry"
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Docker Hub accounts"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]
 [menu.main]
 parent = "smn_pubhub"
-weight = 1
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Docker Hub Automated Builds"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, trusted, builds, trusted builds,  automated builds"]
 [menu.main]
 parent = "smn_pubhub"
-weight = 3
 +++
 <![end-metadata]-->

@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "The Docker Hub Registry help"
 description = "The Docker Registry help documentation home"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]
@@ -1,6 +1,6 @@
 <!--[metadata]>
 +++
-title = "The Docker Hub"
+title = "The Docker Hub help"
 description = "The Docker Help documentation home"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, accounts, organizations, repositories,  groups"]
 [menu.main]
@@ -5,7 +5,6 @@ description = "Guidelines for Official Repositories on Docker Hub"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, official, image,  documentation"]
 [menu.main]
 parent = "smn_pubhub"
-weight = 4
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Your Repositories on Docker Hub"
 keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs,  documentation"]
 [menu.main]
 parent = "smn_pubhub"
-weight = 2
 +++
 <![end-metadata]-->

@@ -4,7 +4,7 @@ title = "Dockerizing a CouchDB service"
 description = "Sharing data between 2 couchdb databases"
 keywords = ["docker, example, package installation, networking, couchdb,  data volumes"]
 [menu.main]
-parent = "smn_applied"
+parent = "smn_remoteapi"
 +++
 <![end-metadata]-->

@@ -0,0 +1,3 @@
+> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
+> then _do not_ type the `sudo` before the `docker` commands shown in the
+> documentation's examples.
@@ -12,185 +12,153 @@ parent = "smn_linux"

 Docker is supported on the following versions of CentOS:

-* CentOS 7.X 
-* CentOS 6.5 or higher 
+- [*CentOS 7 (64-bit)*](#installing-docker-centos-7)
+- [*CentOS 6.5 (64-bit)*](#installing-docker-centos-6.5) or later

-Installation on other binary compatible EL6/EL7 distributions such as Scientific
-Linux might succeed, but Docker does not test or support Docker on these
-distributions.
+These instructions are likely work for other binary compatible EL6/EL7 distributions
+such as Scientific Linux, but they haven't been tested.

-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using CentOS-managed packages, consult your
-CentOS documentation.
+Please note that due to the current Docker limitations, Docker is able to
+run only on the **64 bit** architecture.

-## Prerequisites
+## Kernel support

-Docker requires a 64-bit installation regardless of your CentOS version. Also,
-your kernel must be 3.10 at minimum. CentOS 7 runs the 3.10 kernel, 6.5 does
-not. We make an exception for CentOS 6.5. To run Docker on
-[CentOS-6.5](https://www.centos.org) or later, you need kernel 2.6.32-431 or
-higher. 
+Currently the CentOS project will only support Docker when running on kernels
+shipped by the distribution. There are kernel changes which will cause issues
+if one decides to step outside that box and run non-distribution kernel packages.

-To check your current kernel version, open a terminal and use `uname -r` to
-display your kernel version:
+To run Docker on [CentOS-6.5](http://www.centos.org) or later, you will need
+kernel version 2.6.32-431 or higher as this has specific kernel fixes to allow
+Docker to run.

-    $ uname -r 
-    2.6.32-431.el6.x86_64
+## CentOS-7

-Finally, is it recommended that you fully update your system. Please keep in
-mind that CentOS 6 should be fully patched to fix any potential kernel bugs. Any
-reported kernel bugs may have already been fixed on the latest kernel packages 
+### Installation

-## Install
+Docker is included by default in the CentOS-Extras repository. To install
+run the following command:

-You use the same installation procedure for all versions of CentOS,
-only the package you install differs. There are two packages to choose from:
+    $ sudo yum install docker

-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>6.5 and  higher</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm</a>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm">
-   https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm</a>
-    <p>
-    </p>
-    </td>
-  </tr>
-  <tr>
-    <td>7.X</td>
-    <td>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm</a>   
-    </p>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm</a>   
-    </p>
-    </td>
-  </tr>
-</table>
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

+### Uninstallation

-This procedure depicts an installation on version 6.5. If you are installing on
-7.X, substitute that package for your installation. 
+To uninstall the Docker package:

-1. Log into your machine as a user with `sudo` or `root` privileges.
+    $ sudo yum -y remove docker

-2. Make sure your existing packages are up-to-date.
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:

-		$ sudo yum update
-		
-3. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm
+    $ rm -rf /var/lib/docker

-4. Use `yum` to install the package.
+You must delete the user created configuration files manually.

-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-1.el6.x86_64.rpm
+## CentOS-6.5

-5. Start the Docker daemon.
+### Installation

-		$ sudo service docker start
+For CentOS-6.5, the Docker package is part of [Extra Packages
+for Enterprise Linux (EPEL)](https://fedoraproject.org/wiki/EPEL) repository,
+a community effort to create and maintain additional packages for the RHEL distribution.

-6. Verify `docker` is installed correctly by running a test image in a container.
+Firstly, you need to ensure you have the EPEL repository enabled. Please
+follow the [EPEL installation instructions](
+https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).

-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.0cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
+For CentOS-6, there is a package name conflict with a system tray application
+and its executable, so the Docker RPM package was called `docker-io`.

-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
+To proceed with `docker-io` installation on CentOS-6, you may need to remove the
+`docker` package first.

-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
+    $ sudo yum -y remove docker

-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
+Next, let's install the `docker-io` package which will install Docker on our host.

-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
+    $ sudo yum install docker-io

-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
+### Uninstallation

-To create the `docker` group and add your user:
+To uninstall the Docker package:

-1. Log into Centos as a user with `sudo` privileges.
+    $ sudo yum -y remove docker-io

-2. Create the `docker` group and add your user.
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:

-    `sudo usermod -aG docker your_username`
+    $ rm -rf /var/lib/docker

-3. Log out and log back in.
+You must delete the user created configuration files manually.

-    This ensures your user is running with the correct permissions.
+## Manual installation of latest Docker release

-4. Verify your work by running `docker` without `sudo`.
+While using a package is the recommended way of installing Docker,
+the above package might not be the current release version. If you need the latest
+version, [you can install the binary directly](
+https://docs.docker.com/installation/binaries/).

-		$ docker run hello-world
- 
-## Start the docker daemon at boot
+When installing the binary without a package, you may want
+to integrate Docker with Systemd. For this, install the two unit files
+(service and socket) from [the GitHub
+repository](https://github.com/docker/docker/tree/master/contrib/init/systemd)
+to `/etc/systemd/system`.

-To ensure Docker starts when you boot your system, do the following:
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

-      $ sudo chkconfig docker on
+## Starting the Docker daemon
+
+Once Docker is installed, you will need to start the docker daemon.
+
+    $ sudo service docker start
+
+If we want Docker to start at boot, we should also:
+
+    $ sudo chkconfig docker on
+
+Now let's verify that Docker is working. First we'll need to get the latest
+`centos` image.
+
+    $ sudo docker pull centos
+
+Next we'll make sure that we can see the image by running:
+
+    $ sudo docker images centos
+
+This should generate some output similar to:
+
+    $ sudo docker images centos
+    REPOSITORY      TAG             IMAGE ID          CREATED             VIRTUAL SIZE
+    centos          latest          0b443ba03958      2 hours ago         297.6 MB
+
+Run a simple bash shell to test the image:
+
+    $ sudo docker run -i -t centos /bin/bash
+
+If everything is working properly, you'll get a simple bash prompt. Type
+`exit` to continue.
+
+## Custom daemon options

 If you need to add an HTTP Proxy, set a different directory or partition for the
 Docker runtime files, or make other customizations, read our Systemd article to
 learn how to [customize your Systemd Docker daemon options](/articles/systemd/).

+## Dockerfiles
+The CentOS Project provides a number of sample Dockerfiles which you may use
+either as templates or to familiarize yourself with docker. These templates
+are available on GitHub at [https://github.com/CentOS/CentOS-Dockerfiles](
+https://github.com/CentOS/CentOS-Dockerfiles)

-## Uninstall
+**Done!** You can either continue with the [Docker User
+Guide](/userguide/) or explore and build on the images yourself.

-You can uninstall the Docker software with `yum`.  
+## Issues?

-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-1.el6
-																																								 @/docker-engine-1.7.0-1.el6.x86_64.rpm
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user-created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes, run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.
+If you have any issues - please report them directly in the
+[CentOS bug tracker](http://bugs.centos.org).
@@ -12,221 +12,111 @@ parent = "smn_linux"

 Docker is supported on the following versions of Fedora:

- Fedora 20 
- Fedora 21
- Fedora 22 
+- [*Fedora 20 (64-bit)*](#fedora-20-installation)
+- [*Fedora 21 and later (64-bit)*](#fedora-21-and-later-installation)

-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using Fedora-managed packages, consult your
-Fedora release documentation for information on Fedora's Docker support.
+Currently the Fedora project will only support Docker when running on kernels
+shipped by the distribution. There are kernel changes which will cause issues
+if one decides to step outside that box and run non-distribution kernel packages.

-##Prerequisites
+## Fedora 21 and later

-Docker requires a 64-bit installation regardless of your Fedora version. Also, your kernel must be 3.10 at minimum. To check your current kernel
-version, open a terminal and use `uname -r` to display your kernel version:
+### Installation

-    $ uname -r 
-    3.19.5-100.fc20.x86_64
+Install the Docker package which will install Docker on our host.

-If your kernel is at a older version, you must update it.
+    $ sudo yum -y install docker

-Finally, is it recommended that you fully update your system. Please keep in
-mind that your system should be fully patched to fix any potential kernel bugs. Any
-reported kernel bugs may have already been fixed on the latest kernel packages 
+To update the Docker package:

+    $ sudo yum -y update docker

-## Install
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

-You use the same installation procedure for all versions of Fedora,
-only the package you install differs. There are two packages to choose from:
+### Uninstallation

-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>Fedora 20</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-20/RPMS/x86_64/docker-engine-1.7.0-1.fc20.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-20/RPMS/x86_64/docker-engine-1.7.0-1.fc20.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-20/SRPMS/docker-engine-1.7.0-1.fc20.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-20/SRPMS/docker-engine-1.7.0-1.fc20.src.rpm/a>
-        </p>
-    </td>
-  </tr>
-  <tr>
-    <td>Fedora 21</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-21/RPMS/x86_64/docker-engine-1.7.0-1.fc21.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-21/RPMS/x86_64/docker-engine-1.7.0-1.fc21.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-21/SRPMS/docker-engine-1.7.0-1.fc21.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-21/SRPMS/docker-engine-1.7.0-1.fc21.src.rpm/a>
-        </p>
-    </td>
-  </tr>
-   <tr>
-    <td>Fedora 22</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-22/RPMS/x86_64/docker-engine-1.7.0-1.fc22.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-22/RPMS/x86_64/docker-engine-1.7.0-1.fc22.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-22/SRPMS/docker-engine-1.7.0-1.fc22.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-22/SRPMS/docker-engine-1.7.0-1.fc22.src.rpm/a>
-        </p>
-    </td>
-  </tr> 
-</table>
+To uninstall the Docker package:

+    $ sudo yum -y remove docker

-This procedure depicts an installation on version 21. If you are installing on
-20 or 22, substitute that package for your installation. 
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:

-1. Log into your machine as a user with `sudo` or `root` privileges.
+    $ rm -rf /var/lib/docker

-2. Make sure you don't have an older version of Docker installed.
+You must delete the user created configuration files manually.

-		$ yum list installed | grep docker
-	  
-	If you have an older version, remove it using the `yum -y remove <packagename>` command.
+## Fedora 20

-3. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL https://url_to_package/docker-engine-1.7.0-0.1.fc21.x86_64.rpm
+### Installation

-4. Use `yum` to install the package.
+For `Fedora 20`, there is a package name conflict with a system tray application
+and its executable, so the Docker RPM package was called `docker-io`.

-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-0.1.fc21.x86_64.rpm
+To proceed with `docker-io` installation on Fedora 20, please remove the `docker`
+package first.

-5. Start the Docker daemon.
+    $ sudo yum -y remove docker
+    $ sudo yum -y install docker-io

-		$ sudo service docker start
+To update the Docker package:

-6. Verify `docker` is installed correctly by running a test image in a container.
+    $ sudo yum -y update docker-io

-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
+### Uninstallation

-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
+To uninstall the Docker package:

-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
+    $ sudo yum -y remove docker-io

-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:

-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
+    $ rm -rf /var/lib/docker

->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
+You must delete the user created configuration files manually.

-To create the `docker` group and add your user:
+## Starting the Docker daemon

-1. Log into your system as a user with `sudo` privileges.
+Now that it's installed, let's start the Docker daemon.

-2. Create the `docker` group and add your user.
+    $ sudo systemctl start docker

-    `sudo usermod -aG docker your_username`
+If we want Docker to start at boot, we should also:

-3. Log out and log back in.
+    $ sudo systemctl enable docker

-    This ensures your user is running with the correct permissions.
+Now let's verify that Docker is working.

-4. Verify your work by running `docker` without `sudo`.
+    $ sudo docker run -i -t fedora /bin/bash

-        $ docker run hello-world
-				Unable to find image 'hello-world:latest' locally
-				latest: Pulling from hello-world
-				a8219747be10: Pull complete 
-				91c95931e552: Already exists 
-				hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-				Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-				Status: Downloaded newer image for hello-world:latest
-				Hello from Docker.
-				This message shows that your installation appears to be working correctly.
+> Note: If you get a `Cannot start container` error mentioning SELinux
+> or permission denied, you may need to update the SELinux policies.
+> This can be done using `sudo yum upgrade selinux-policy` and then rebooting.

-				To generate this message, Docker took the following steps:
-				 1. The Docker client contacted the Docker daemon.
-				 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-						(Assuming it was not already locally available.)
-				 3. The Docker daemon created a new container from that image which runs the
-						executable that produces the output you are currently reading.
-				 4. The Docker daemon streamed that output to the Docker client, which sent it
-						to your terminal.
+## Granting rights to users to use Docker

-				To try something more ambitious, you can run an Ubuntu container with:
-				 $ docker run -it ubuntu bash
+The `docker` command line tool contacts the `docker` daemon process via a
+socket file `/var/run/docker.sock` owned by `root:root`. Though it's
+[recommended](https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2015-January/msg00034.html)
+to use `sudo` for docker commands, if users wish to avoid it, an administrator can
+create a `docker` group, have it own `/var/run/docker.sock`, and add users to this group.

-				For more examples and ideas, visit:
-				 http://docs.docker.com/userguide/
- 
-## Start the docker daemon at boot
+    $ sudo groupadd docker
+    $ sudo chown root:docker /var/run/docker.sock
+    $ sudo usermod -a -G docker $USERNAME

-To ensure Docker starts when you boot your system, do the following:
-
-    $ sudo chkconfig docker on
+## Custom daemon options

 If you need to add an HTTP Proxy, set a different directory or partition for the
 Docker runtime files, or make other customizations, read our Systemd article to
 learn how to [customize your Systemd Docker daemon options](/articles/systemd/).

+## What next?

-## Uninstall
+Continue with the [User Guide](/userguide/).

-You can uninstall the Docker software with `yum`.  
-
-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-0.1.fc20
-																																								 @/docker-engine-1.7.0-0.1.fc20.el6.x86_64
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user-created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes, run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.
@@ -14,7 +14,7 @@ You can install Docker using Boot2Docker to run `docker` commands at your comman
 Choose this installation if you are familiar with the command-line or plan to
 contribute to the Docker project on GitHub.

-[<img src="/installation/images/kitematic.png" alt="Download Kitematic"
+[<img src="/engine/installation/images/kitematic.png" alt="Download Kitematic"
 style="float:right;">](https://kitematic.com/download)

 Alternatively, you may want to try <a id="inlinelink" href="https://kitematic.com/"
@@ -355,4 +355,4 @@ at  [Boot2Docker repository](https://github.com/boot2docker/boot2docker).
 Thanks to Chris Jones whose [blog](http://viget.com/extend/how-to-use-docker-on-os-x-the-missing-guide)  
 inspired me to redo this page.

-Continue with the [Docker User Guide](/userguide).
+Continue with the [Docker User Guide](/userguide/).
@@ -12,178 +12,150 @@ parent = "smn_linux"

 Docker is supported on the following versions of RHEL:

- Red Hat Enterprise Linux 7 
- Red Hat Enterprise Linux 6.6 or later
+- [*Red Hat Enterprise Linux 7 (64-bit)*](#red-hat-enterprise-linux-7-installation)
+- [*Red Hat Enterprise Linux 6.6 (64-bit)*](#red-hat-enterprise-linux-66-installation) or later

-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using Red Hat-managed packages, consult your
-Red Hat release documentation for information on Red Hat's Docker support.
+## Kernel support

-## Prerequisites
+RHEL will only support Docker via the *extras* channel or EPEL package when
+running on kernels shipped by the distribution. There are kernel changes which
+will cause issues if one decides to step outside that box and run
+non-distribution kernel packages.

-Docker requires a 64-bit installation regardless of your Red Hat version. Docker
-requires that your kernel must be 3.10 at minimum. Red Hat 7 runs the 3.10
-kernel, 6.6 does not. We make an exception for Red Hat 6.6. To run Docker on
-[Red Hat-6.6](http://www.centos.org) or later, you need kernel 2.6.32-431 or
-higher. 
+## Red Hat Enterprise Linux 7

-To check your current kernel version, open a terminal and use `uname -r` to
-display your kernel version:
+### Installation

-    $ uname -r 
-    3.10.0-229.el7.x86_64
+**Red Hat Enterprise Linux 7 (64 bit)** has [shipped with
+Docker](https://access.redhat.com/site/products/red-hat-enterprise-linux/docker-and-containers).
+An overview and some guidance can be found in the [Release
+Notes](https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/chap-Red_Hat_Enterprise_Linux-7.0_Release_Notes-Linux_Containers_with_Docker_Format.html).

-Finally, is it recommended that you fully update your system. Please keep in
-mind that your system should be fully patched to fix any potential kernel bugs.
-Any reported kernel bugs may have already been fixed on the latest kernel
-packages 
+Docker is located in the *extras* channel. To install Docker:

+1. Enable the *extras* channel:

-## Install
+        $ sudo subscription-manager repos --enable=rhel-7-server-extras-rpms

-You use the same installation procedure for all versions of Red Hat Enterprise,
-only the package you install differs.  There are two packages to choose from:
+2. Install Docker:

-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>6.6 and  higher</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm</a>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm">
-   https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm</a>
-    <p>
-    </p>
-    </td>
-  </tr>
-  <tr>
-    <td>7.X</td>
-    <td>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm</a>   
-    </p>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm</a>   
-    </p>
-    </td>
-  </tr>
-</table>
+        $ sudo yum install docker 

-This procedure depicts an installation on version 6.6.  If you are installing on
-7.X, substitute that package for your installation. 
+Additional installation, configuration, and usage information,
+including a [Get Started with Docker Containers in Red Hat
+Enterprise Linux 7](https://access.redhat.com/site/articles/881893)
+guide, can be found by Red Hat customers on the [Red Hat Customer
+Portal](https://access.redhat.com/).

-1. Log into your machine as a user with `sudo` or `root` privileges.
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).

-2. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL http://get.docker.com/docker/1.7.0/rpms/centos-6/RPMS/x86_64/docker-engine-1.7.0-0.1.el6.x86_64.rpm
+### Uninstallation

-3. Use `yum` to install the package.
+To uninstall the Docker package:

-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-0.1.el6.x86_64.rpm
+    $ sudo yum -y remove docker

-5. Start the Docker daemon.
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:

-		$ sudo service docker start
+    $ rm -rf /var/lib/docker

-6. Verify `docker` is installed correctly.
+You must delete the user created configuration files manually.

-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
+## Red Hat Enterprise Linux 6.6

-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
+You will need **64 bit** [RHEL
+6.6](https://access.redhat.com/site/articles/3078#RHEL6) or later, with
+a RHEL 6 kernel version 2.6.32-504.16.2 or higher as this has specific kernel
+fixes to allow Docker to work. Related issues: [#9856](https://github.com/docker/docker/issues/9856).

-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
+Docker is available for **RHEL6.6** on EPEL. Please note that
+this package is part of [Extra Packages for Enterprise Linux
+(EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort to
+create and maintain additional packages for the RHEL distribution.

-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
+### Kernel support

-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
+RHEL will only support Docker via the *extras* channel or EPEL package when
+running on kernels shipped by the distribution. There are things like namespace
+changes which will cause issues if one decides to step outside that box and run
+non-distro kernel packages.

-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
+> **Warning**:
+> Please keep your system up to date using `yum update` and rebooting
+> your system. Keeping your system updated ensures critical security
+>  vulnerabilities and severe bugs (such as those found in kernel 2.6.32)
+> are fixed.

->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
+###  Installation

-To create the `docker` group and add your user:
+Firstly, you need to install the EPEL repository. Please follow the
+[EPEL installation
+instructions](https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).

-1. Log into your machine as a user with `sudo` or `root` privileges.
+There is a package name conflict with a system tray application
+and its executable, so the Docker RPM package was called `docker-io`.

-2. Create the `docker` group and add your user.
+To proceed with `docker-io` installation, you may need to remove the
+`docker` package first.

-    `sudo usermod -aG docker your_username`
+    $ sudo yum -y remove docker

-3. Log out and log back in.
+Next, let's install the `docker-io` package which will install Docker on our host.

-    This ensures your user is running with the correct permissions.
+    $ sudo yum install docker-io

-4. Verify your work by running `docker` without `sudo`.
+To update the `docker-io` package

-			$ docker run hello-world
- 
-## Start the docker daemon at boot
+    $ sudo yum -y update docker-io

-To ensure Docker starts when you boot your system, do the following:
+Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
+
+### Uninstallation
+
+To uninstall the Docker package:
+
+    $ sudo yum -y remove docker-io
+
+The above command will not remove images, containers, volumes, or user created
+configuration files on your host. If you wish to delete all images, containers,
+and volumes run the following command:
+
+    $ rm -rf /var/lib/docker
+
+You must delete the user created configuration files manually.
+
+## Starting the Docker daemon
+
+Now that it's installed, let's start the Docker daemon.
+
+    $ sudo service docker start
+
+If we want Docker to start at boot, we should also:

    $ sudo chkconfig docker on

+Now let's verify that Docker is working.
+
+    $ sudo docker run -i -t fedora /bin/bash
+
+> Note: If you get a `Cannot start container` error mentioning SELinux
+> or permission denied, you may need to update the SELinux policies.
+> This can be done using `sudo yum upgrade selinux-policy` and then rebooting.
+
+**Done!**
+
+Continue with the [User Guide](/userguide/).
+
+## Custom daemon options
+
 If you need to add an HTTP Proxy, set a different directory or partition for the
 Docker runtime files, or make other customizations, read our Systemd article to
 learn how to [customize your Systemd Docker daemon options](/articles/systemd/).

+## Issues?

-## Uninstall
-
-You can uninstall the Docker software with `yum`.  
-
-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-0.1.el6
-																																					 @/docker-engine-1.7.0-0.1.el6.x86_64
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.
+If you have any issues - please report them directly in the
+[Red Hat Bugzilla for docker-io component](
+https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=docker-io).
@@ -8,7 +8,7 @@ parent = "smn_linux"
 +++
 <![end-metadata]-->

-# Ubuntu
+#Ubuntu

 Docker is supported on these Ubuntu operating systems:

@@ -53,9 +53,7 @@ is developed, you can launch only Linux containers from your Windows machine.

 ## Running Docker

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}

 **Boot2Docker Start** will automatically start a shell with environment variables
 correctly set so you can start using Docker right away:
@@ -36,9 +36,7 @@ Windows*](../installation/windows/#windows) installation guides. The small Linux
 distribution boot2docker can be run inside virtual machines on these two
 operating systems.

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}

 ### How do containers compare to virtual machines?

@@ -1,10 +1,12 @@
 <!--[metadata]>
 +++
-title = "About Docker"
+draft = true
+title = "Get started with Docker"
 description = "Introduction to Docker."
 keywords = ["docker, introduction, documentation, about, technology, understanding,  Dockerfile"]
 [menu.main]
 parent = "mn_use_docker"
+weight = 1
 +++
 <![end-metadata]-->

@@ -0,0 +1,229 @@
+site_name: Docker Documentation
+#site_url: https://docs.docker.com/
+site_url: /
+site_description: Documentation for fast and lightweight Docker container based virtualization framework.
+site_favicon: img/favicon.png
+
+dev_addr: '0.0.0.0:8000'
+
+repo_url: https://github.com/docker/docker/
+
+docs_dir: sources
+
+include_search: true
+
+use_absolute_urls: true
+
+# theme: docker
+theme_dir: ./theme/mkdocs/
+theme_center_lead: false
+
+copyright: Copyright &copy; 2014-2015, Docker, Inc.
+google_analytics: ['UA-6096819-11', 'docker.io']
+
+pages:
+
+# Introduction:
+- ['index.md', 'About', 'Docker']
+- ['introduction/understanding-docker.md', 'About', 'Understanding Docker']
+- ['release-notes.md', 'About', 'Release notes']
+- ['reference/glossary.md', 'About', 'Glossary']
+- ['introduction/index.md', '**HIDDEN**']
+
+
+# Installation:
+- ['installation/index.md', '**HIDDEN**']
+- ['installation/ubuntulinux.md', 'Installation', 'Ubuntu']
+- ['installation/mac.md', 'Installation', 'Mac OS X']
+- ['kitematic/index.md', 'Installation', 'Kitematic on OS X']
+- ['installation/windows.md', 'Installation', 'Microsoft Windows']
+- ['installation/testing-windows-docker-client.md', 'Installation', 'Building and testing the Windows Docker client']
+- ['installation/amazon.md', 'Installation', 'Amazon EC2']
+- ['installation/archlinux.md', 'Installation', 'Arch Linux']
+- ['installation/binaries.md', 'Installation', 'Binaries']
+- ['installation/centos.md', 'Installation', 'CentOS']
+- ['installation/cruxlinux.md', 'Installation', 'CRUX Linux']
+- ['installation/debian.md', 'Installation', 'Debian']
+- ['installation/fedora.md', 'Installation', 'Fedora']
+- ['installation/frugalware.md', 'Installation', 'FrugalWare']
+- ['installation/google.md', 'Installation', 'Google Cloud Platform']
+- ['installation/gentoolinux.md', 'Installation', 'Gentoo']
+- ['installation/softlayer.md', 'Installation', 'IBM Softlayer']
+- ['installation/joyent.md', 'Installation', 'Joyent Compute Service']
+- ['installation/azure.md', 'Installation', 'Microsoft Azure']
+- ['installation/rackspace.md', 'Installation', 'Rackspace Cloud']
+- ['installation/rhel.md', 'Installation', 'Red Hat Enterprise Linux']
+- ['installation/oracle.md', 'Installation', 'Oracle Linux']
+- ['installation/SUSE.md', 'Installation', 'SUSE']
+- ['compose/install.md', 'Installation', 'Docker Compose']
+
+# User Guide:
+- ['userguide/index.md', 'User Guide', 'The Docker user guide' ]
+- ['userguide/dockerhub.md', 'User Guide', 'Getting started with Docker Hub' ]
+- ['userguide/dockerizing.md', 'User Guide', 'Dockerizing applications' ]
+- ['userguide/usingdocker.md', 'User Guide', 'Working with containers' ]
+- ['userguide/dockerimages.md', 'User Guide', 'Working with Docker images' ]
+- ['userguide/dockerlinks.md', 'User Guide', 'Linking containers together' ]
+- ['userguide/dockervolumes.md', 'User Guide', 'Managing data in containers' ]
+- ['userguide/labels-custom-metadata.md', 'User Guide', 'Apply custom metadata' ]
+- ['userguide/dockerrepos.md', 'User Guide', 'Working with Docker Hub' ]
+- ['userguide/level1.md', '**HIDDEN**' ]
+- ['userguide/level2.md', '**HIDDEN**' ]
+- ['compose/index.md', 'User Guide', 'Docker Compose' ]
+- ['compose/production.md', 'User Guide', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Use Compose in production' ]
+- ['compose/extends.md', 'User Guide', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Extend Compose services' ]
+- ['machine/index.md', 'User Guide', 'Docker Machine' ]
+- ['swarm/index.md', 'User Guide', 'Docker Swarm' ]
+- ['kitematic/userguide.md', 'User Guide', 'Kitematic']
+
+# Docker Hub docs:
+- ['docker-hub/index.md', 'Docker Hub', 'Docker Hub' ]
+- ['docker-hub/accounts.md', 'Docker Hub', 'Accounts']
+- ['docker-hub/userguide.md', 'Docker Hub', 'User Guide']
+- ['docker-hub/repos.md', 'Docker Hub', 'Your Repositories']
+- ['docker-hub/builds.md', 'Docker Hub', 'Automated Builds']
+- ['docker-hub/official_repos.md', 'Docker Hub', 'Official Repositories']
+
+# Docker Hub Enterprise:
+- ['docker-hub-enterprise/index.md', 'Docker Hub Enterprise', 'Overview' ]
+- ['docker-hub-enterprise/quick-start.md', 'Docker Hub Enterprise', 'Quick Start: Basic Workflow' ]
+- ['docker-hub-enterprise/userguide.md', 'Docker Hub Enterprise', 'User Guide' ]
+- ['docker-hub-enterprise/adminguide.md', 'Docker Hub Enterprise', 'Admin Guide' ]
+- ['docker-hub-enterprise/install.md', 'Docker Hub Enterprise', '&nbsp;&nbsp;Installation' ]
+- ['docker-hub-enterprise/configuration.md', 'Docker Hub Enterprise', '&nbsp;&nbsp;Configuration options' ]
+- ['docker-hub-enterprise/support.md', 'Docker Hub Enterprise', 'Support' ]
+- ['docker-hub-enterprise/release-notes.md', 'Docker Hub Enterprise', 'Release notes' ]
+
+# Examples:
+- ['examples/index.md', '**HIDDEN**']
+- ['examples/nodejs_web_app.md', 'Examples', 'Dockerizing a Node.js web application']
+- ['examples/mongodb.md', 'Examples', 'Dockerizing MongoDB']
+- ['examples/running_redis_service.md', 'Examples', 'Dockerizing a Redis service']
+- ['examples/postgresql_service.md', 'Examples', 'Dockerizing a PostgreSQL service']
+- ['examples/running_riak_service.md', 'Examples', 'Dockerizing a Riak service']
+- ['examples/running_ssh_service.md', 'Examples', 'Dockerizing an SSH service']
+- ['examples/couchdb_data_volumes.md', 'Examples', 'Dockerizing a CouchDB service']
+- ['examples/apt-cacher-ng.md', 'Examples', 'Dockerizing an Apt-Cacher-ng service']
+- ['compose/django.md', 'Examples', 'Getting started with Compose and Django']
+- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails']
+- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress']
+- ['kitematic/minecraft-server.md', 'Examples', 'Kitematic: Minecraft server']
+- ['kitematic/nginx-web-server.md', 'Examples', 'Kitematic: Ngnix web server']
+- ['kitematic/rethinkdb-dev-database.md', 'Examples', 'Kitematic: RethinkDB development database']
+
+# Articles
+- ['articles/index.md', '**HIDDEN**']
+- ['articles/basics.md', 'Articles', 'Docker basics']
+- ['articles/networking.md', 'Articles', 'Advanced networking']
+- ['articles/security.md', 'Articles', 'Security']
+- ['articles/https.md', 'Articles', 'Running Docker with HTTPS']
+- ['articles/registry_mirror.md', 'Articles', 'Run a local registry mirror']
+- ['articles/host_integration.md', 'Articles', 'Automatically starting containers']
+- ['articles/baseimages.md', 'Articles', 'Creating a base image']
+- ['articles/dockerfile_best-practices.md', 'Articles', 'Best practices for writing Dockerfiles']
+- ['articles/certificates.md', 'Articles', 'Using certificates for repository client verification']
+- ['articles/using_supervisord.md', 'Articles', 'Using Supervisor']
+- ['articles/configuring.md', 'Articles', 'Configuring Docker']
+- ['articles/cfengine_process_management.md', 'Articles', 'Process management with CFEngine']
+- ['articles/puppet.md', 'Articles', 'Using Puppet']
+- ['articles/chef.md', 'Articles', 'Using Chef']
+- ['articles/dsc.md', 'Articles', 'Using PowerShell DSC']
+- ['articles/ambassador_pattern_linking.md', 'Articles', 'Cross-Host linking using ambassador containers']
+- ['articles/runmetrics.md', 'Articles', 'Runtime metrics']
+- ['articles/b2d_volume_resize.md', 'Articles', 'Increasing a Boot2Docker volume']
+- ['articles/systemd.md', 'Articles', 'Controlling and configuring Docker using Systemd']
+
+# Reference
+- ['reference/index.md', '**HIDDEN**']
+- ['reference/commandline/index.md', '**HIDDEN**']
+- ['reference/commandline/cli.md', 'Reference', 'Docker command line']
+- ['reference/builder.md', 'Reference', 'Dockerfile']
+- ['faq.md', 'Reference', 'FAQ']
+- ['reference/run.md', 'Reference', 'Run reference']
+- ['reference/logging/journald.md', '**HIDDEN**']
+- ['compose/cli.md', 'Reference', 'Compose command line']
+- ['compose/yml.md', 'Reference', 'Compose yml']
+- ['compose/env.md', 'Reference', 'Compose ENV variables']
+- ['compose/completion.md', 'Reference', 'Compose commandline completion']
+- ['swarm/discovery.md', 'Reference', 'Swarm discovery']
+- ['swarm/scheduler/strategy.md', 'Reference', 'Swarm strategies']
+- ['swarm/scheduler/filter.md', 'Reference', 'Swarm filters']
+- ['swarm/API.md', 'Reference', 'Swarm API']
+- ['reference/api/index.md', '**HIDDEN**']
+- ['registry/index.md', 'Reference', 'Docker Registry 2.0']
+- ['registry/deploying.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Deploy a registry' ]
+- ['registry/configuration.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Configure a registry' ]
+- ['registry/storagedrivers.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Storage driver model' ]
+- ['registry/notifications.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Work with notifications' ]
+- ['registry/spec/api.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Registry Service API v2' ]
+- ['registry/spec/json.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; JSON format' ]
+- ['registry/spec/auth/token.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; Authenticate via central service' ]
+- ['reference/api/hub_registry_spec.md', 'Reference', 'Docker Hub and Registry 1.0']
+- ['reference/api/registry_api.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp;Docker Registry API v1']
+- ['reference/api/registry_api_client_libraries.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp;Docker Registry 1.0 API client libraries']
+#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']
+- ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API']
+#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']
+- ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API']
+- ['reference/api/docker_remote_api_v1.19.md', 'Reference', 'Docker Remote API v1.19']
+- ['reference/api/docker_remote_api_v1.18.md', 'Reference', 'Docker Remote API v1.18']
+- ['reference/api/docker_remote_api_v1.17.md', 'Reference', 'Docker Remote API v1.17']
+- ['reference/api/docker_remote_api_v1.16.md', 'Reference', 'Docker Remote API v1.16']
+- ['reference/api/docker_remote_api_v1.15.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.14.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.13.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.12.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.11.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.10.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.9.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.8.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.7.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.6.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.5.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.4.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.3.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.2.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.1.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.0.md', '**HIDDEN**']
+- ['reference/api/remote_api_client_libraries.md', 'Reference', 'Docker Remote API client libraries']
+- ['reference/api/docker_io_accounts_api.md', 'Reference', 'Docker Hub accounts API']
+- ['kitematic/faq.md', 'Reference', 'Kitematic: FAQ']
+- ['kitematic/known-issues.md', 'Reference', 'Kitematic: Known issues']
+
+# Hidden registry files
+- ['registry/storage-drivers/azure.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/s3.md', '**HIDDEN**' ]
+
+- ['jsearch.md', '**HIDDEN**']
+
+# - ['static_files/README.md', 'static_files', 'README']
+- ['terms/index.md', '**HIDDEN**']
+- ['terms/layer.md', '**HIDDEN**']
+- ['terms/index.md', '**HIDDEN**']
+- ['terms/registry.md', '**HIDDEN**']
+- ['terms/container.md', '**HIDDEN**']
+- ['terms/repository.md', '**HIDDEN**']
+- ['terms/filesystem.md', '**HIDDEN**']
+- ['terms/image.md', '**HIDDEN**']
+
+
+# Project:
+- ['project/index.md', '**HIDDEN**']
+- ['project/who-written-for.md', 'Contributor', 'README first']
+- ['project/software-required.md', 'Contributor', 'Get required software for Linux or OS X'] 
+- ['project/software-req-win.md', 'Contributor', 'Get required software for Windows']
+- ['project/set-up-git.md', 'Contributor', 'Configure Git for contributing'] 
+- ['project/set-up-dev-env.md', 'Contributor', 'Work with a development container'] 
+- ['project/test-and-docs.md', 'Contributor', 'Run tests and test documentation']
+- ['project/make-a-contribution.md', 'Contributor', 'Understand contribution workflow']
+- ['project/find-an-issue.md', 'Contributor', 'Find an issue'] 
+- ['project/work-issue.md', 'Contributor', 'Work on an issue'] 
+- ['project/create-pr.md', 'Contributor', 'Create a pull request'] 
+- ['project/review-pr.md', 'Contributor', 'Participate in the PR review'] 
+- ['project/advanced-contributing.md', 'Contributor', 'Advanced contributing']
+- ['project/get-help.md', 'Contributor', 'Where to get help']
+- ['project/coding-style.md', 'Contributor', 'Coding style guide']
+- ['project/doc-style.md', 'Contributor', 'Documentation style guide']
+
@@ -5,7 +5,6 @@ description = "Explains workflows for refactor and design proposals"
 keywords = ["contribute, project, design, refactor,  proposal"]
 [menu.main]
 parent = "smn_contribute"
-weight=6
 +++
 <![end-metadata]-->

@@ -4,8 +4,7 @@ title = "Coding style checklist"
 description = "List of guidelines for coding Docker contributions"
 keywords = ["change, commit, squash, request, pull request, test, unit test, integration tests, Go, gofmt,  LGTM"]
 [menu.main]
-parent = "smn_contribute"
-weight=7
+parent = "mn_opensource"
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Basic workflow for Docker contributions"
 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]
 [menu.main]
 parent = "smn_contribute"
-weight=4
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Style guide for Docker documentation describing standards and con
 keywords = ["style, guide, docker,  documentation"]
 [menu.main]
 parent = "mn_opensource"
-weight=100
 +++
 <![end-metadata]-->

@@ -1,11 +1,10 @@
 <!--[metadata]>
 +++
-title = "Find and claim an issue"
+title = "Make a project contribution"
 description = "Basic workflow for Docker contributions"
-keywords = ["contribute, issue, review, workflow, beginner, expert, squash,  commit"]
+keywords = ["contribute, pull request, review, workflow, beginner, expert, squash,  commit"]
 [menu.main]
 parent = "smn_contribute"
-weight=2
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Basic workflow for Docker contributions"
 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]
 [menu.main]
 parent = "smn_contribute"
-weight=5
 +++
 <![end-metadata]-->

@@ -84,8 +83,8 @@ To update your existing pull request:
        # Your branch is up-to-date with 'origin/11038-fix-rhel-link'.
        #
        # Changes to be committed:
-        #		modified:   docs/installation/mac.md
-        #		modified:   docs/installation/rhel.md
+        #		modified:   docs/sources/installation/mac.md
+        #		modified:   docs/sources/installation/rhel.md

 5. Force push the change to your origin.

@@ -5,7 +5,6 @@ description = "How to use Docker's development environment"
 keywords = ["development, inception, container, image Dockerfile, dependencies, Go,  artifacts"]
 [menu.main]
 parent = "smn_develop"
-weight=5
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Describes how to set up your local machine and repository"
 keywords = ["GitHub account, repository, clone, fork, branch, upstream, Git, Go, make "]
 [menu.main]
 parent = "smn_develop"
-weight=4
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "How to set up a server to test Docker Windows client"
 keywords = ["development, inception, container, image Dockerfile, dependencies, Go, artifacts,  windows"]
 [menu.main]
 parent = "smn_develop"
-weight=3
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "Describes the software required to contribute to Docker"
 keywords = ["GitHub account, repository, Docker, Git, Go, make,  "]
 [menu.main]
 parent = "smn_develop"
-weight=2
 +++
 <![end-metadata]-->

@@ -4,8 +4,7 @@ title = "Run tests and test documentation"
 description = "Describes Docker's testing infrastructure"
 keywords = ["make test, make docs, Go tests, gofmt, contributing,  running tests"]
 [menu.main]
-parent = "smn_develop"
-weight=6
+parent = "smn_contribute"
 +++
 <![end-metadata]-->

@@ -275,7 +274,7 @@ make any changes just run these commands again.

 ## Build and test the documentation

-The Docker documentation source files are under `docs`. The content is
+The Docker documentation source files are under `docs/sources`. The content is
 written using extended Markdown. We use the static generator <a
 href="http://www.mkdocs.org/" target="_blank">MkDocs</a> to build Docker's
 documentation. Of course, you don't need to install this generator
@@ -5,7 +5,6 @@ description = "Basic workflow for Docker contributions"
 keywords = ["contribute, pull request, review, workflow, beginner, squash,  commit"]
 [menu.main]
 parent = "smn_contribute"
-weight=3
 +++
 <![end-metadata]-->

@@ -98,16 +97,16 @@ Follow this workflow as you work:
          (use "git add <file>..." to update what will be committed)
          (use "git checkout -- <file>..." to discard changes in working directory)

-        modified:   docs/installation/mac.md
-        modified:   docs/installation/rhel.md
+        modified:   docs/sources/installation/mac.md
+        modified:   docs/sources/installation/rhel.md

    The `status` command lists what changed in the repository. Make sure you see
    the changes you expect.

 7. Add your change to Git.

-        $ git add docs/installation/mac.md
-        $ git add docs/installation/rhel.md
+        $ git add docs/sources/installation/mac.md
+        $ git add docs/sources/installation/rhel.md


 8. Commit your changes making sure you use the `-s` flag to sign your work.
@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "Remote API v1.10"
 description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "Remote API v1.11"
 description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "Remote API v1.12"
 description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "Remote API v1.13"
 description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 7
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 6
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 5
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 4
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 3
 +++
 <![end-metadata]-->

@@ -5,7 +5,6 @@ description = "API Documentation for Docker"
 keywords = ["API, Docker, rcli, REST,  documentation"]
 [menu.main]
 parent = "smn_remoteapi"
-weight = 2
 +++
 <![end-metadata]-->

@@ -1,14 +1,14 @@
 <!--[metadata]>
 +++
-title = "The Docker Hub and the Registry v1"
+title = "Registry documentation"
 description = "Documentation for docker Registry and Registry API"
 keywords = ["docker, registry, api,  hub"]
 [menu.main]
-parent="smn_hub_ref"
+parent="smn_registry_ref"
 +++
 <![end-metadata]-->

-# The Docker Hub and the Registry v1
+# The Docker Hub and the Registry 1.0 spec

 ## The three roles

@@ -1,7 +1,6 @@
 <!--[metadata]>
 +++
-draft = true
-title = "Registry v1 API"
+title = "Registry API"
 description = "API Documentation for Docker Registry"
 keywords = ["API, Docker, index, registry, REST,  documentation"]
 [menu.main]
@@ -1,6 +1,5 @@
 <!--[metadata]>
 +++
-draft = true
 title = "Registry API v1 client libraries"
 description = "Various client libraries available to use with the Docker registry API"
 keywords = ["API, Docker, index, registry, REST, documentation, clients, C#, Erlang, Go, Groovy, Java, JavaScript, Perl, PHP, Python, Ruby, Rust,  Scala"]
@@ -10,9 +10,7 @@ parent = "mn_reference"

 # Docker Command Line

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}

 To list available commands, either run `docker` with no parameters
 or execute `docker help`:
@@ -1,489 +0,0 @@
-<!--[metadata]>
-+++
-title = "daemon"
-description = "The daemon command description and usage"
-keywords = ["container, daemon, runtime"]
-[menu.main]
-parent = "smn_cli"
-+++
-<![end-metadata]-->
-
-# daemon
-
-    Usage: docker [OPTIONS] COMMAND [arg...]
-
-    A self-sufficient runtime for linux containers.
-
-    Options:
-      --api-cors-header=""                   Set CORS headers in the remote API
-      -b, --bridge=""                        Attach containers to a network bridge
-      --bip=""                               Specify network bridge IP
-      -D, --debug=false                      Enable debug mode
-      -d, --daemon=false                     Enable daemon mode
-      --default-gateway=""                   Container default gateway IPv4 address
-      --default-gateway-v6=""                Container default gateway IPv6 address
-      --dns=[]                               DNS server to use
-      --dns-search=[]                        DNS search domains to use
-      --default-ulimit=[]                    Set default ulimit settings for containers
-      -e, --exec-driver="native"             Exec driver to use
-      --exec-opt=[]                          Set exec driver options
-      --exec-root="/var/run/docker"          Root of the Docker execdriver
-      --fixed-cidr=""                        IPv4 subnet for fixed IPs
-      --fixed-cidr-v6=""                     IPv6 subnet for fixed IPs
-      -G, --group="docker"                   Group for the unix socket
-      -g, --graph="/var/lib/docker"          Root of the Docker runtime
-      -H, --host=[]                          Daemon socket(s) to connect to
-      -h, --help=false                       Print usage
-      --icc=true                             Enable inter-container communication
-      --insecure-registry=[]                 Enable insecure registry communication
-      --ip=0.0.0.0                           Default IP when binding container ports
-      --ip-forward=true                      Enable net.ipv4.ip_forward
-      --ip-masq=true                         Enable IP masquerading
-      --iptables=true                        Enable addition of iptables rules
-      --ipv6=false                           Enable IPv6 networking
-      -l, --log-level="info"                 Set the logging level
-      --label=[]                             Set key=value labels to the daemon
-      --log-driver="json-file"               Default driver for container logs
-      --log-opt=[]                           Log driver specific options
-      --mtu=0                                Set the containers network MTU
-      -p, --pidfile="/var/run/docker.pid"    Path to use for daemon PID file
-      --registry-mirror=[]                   Preferred Docker registry mirror
-      -s, --storage-driver=""                Storage driver to use
-      --selinux-enabled=false                Enable selinux support
-      --storage-opt=[]                       Set storage driver options
-      --tls=false                            Use TLS; implied by --tlsverify
-      --tlscacert="~/.docker/ca.pem"         Trust certs signed only by this CA
-      --tlscert="~/.docker/cert.pem"         Path to TLS certificate file
-      --tlskey="~/.docker/key.pem"           Path to TLS key file
-      --tlsverify=false                      Use TLS and verify the remote
-      --userland-proxy=true                  Use userland proxy for loopback traffic
-      -v, --version=false                    Print version information and quit
-
-Options with [] may be specified multiple times.
-
-The Docker daemon is the persistent process that manages containers. Docker
-uses the same binary for both the daemon and client. To run the daemon you
-provide the `-d` flag.
-
-To run the daemon with debug output, use `docker -d -D`.
-
-## Daemon socket option
-
-The Docker daemon can listen for [Docker Remote API](/reference/api/docker_remote_api/)
-requests via three different types of Socket: `unix`, `tcp`, and `fd`.
-
-By default, a `unix` domain socket (or IPC socket) is created at
-`/var/run/docker.sock`, requiring either `root` permission, or `docker` group
-membership.
-
-If you need to access the Docker daemon remotely, you need to enable the `tcp`
-Socket. Beware that the default setup provides un-encrypted and
-un-authenticated 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`. 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 `docker -d -H fd://`. Using `fd://` will work perfectly for most setups but
-you can also specify individual sockets: `docker -d -H fd://3`. If the
-specified socket activated files aren't found, then Docker will exit. You can
-find examples of using Systemd socket activation with Docker and Systemd in the
-[Docker source tree](https://github.com/docker/docker/tree/master/contrib/init/systemd/).
-
-You can configure the Docker daemon to listen to multiple sockets at the same
-time using multiple `-H` options:
-
-    # listen using the default unix socket, and on 2 specific IP addresses on this host.
-    docker -d -H unix:///var/run/docker.sock -H tcp://192.168.59.106 -H tcp://10.10.10.2
-
-The Docker client will honor the `DOCKER_HOST` environment variable to set the
-`-H` flag for the client.
-
-    $ docker -H tcp://0.0.0.0:2375 ps
-    # or
-    $ export DOCKER_HOST="tcp://0.0.0.0:2375"
-    $ docker ps
-    # both are equal
-
-Setting the `DOCKER_TLS_VERIFY` environment variable to any value other than
-the empty string is equivalent to setting the `--tlsverify` flag. The following
-are equivalent:
-
-    $ docker --tlsverify ps
-    # or
-    $ export DOCKER_TLS_VERIFY=1
-    $ docker ps
-
-The Docker client will honor the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
-environment variables (or the lowercase versions thereof). `HTTPS_PROXY` takes
-precedence over `HTTP_PROXY`.
-
-### Daemon storage-driver option
-
-The Docker daemon has support for several different image layer storage
-drivers: `aufs`, `devicemapper`, `btrfs`, `zfs` and `overlay`.
-
-The `aufs` driver is the oldest, but is based on a Linux kernel patch-set that
-is unlikely to be merged into the main kernel. These are also known to cause
-some serious kernel crashes. However, `aufs` is also the only storage driver
-that allows containers to share executable and shared library memory, so is a
-useful choice when running thousands of containers with the same program or
-libraries.
-
-The `devicemapper` driver uses thin provisioning and Copy on Write (CoW)
-snapshots. For each devicemapper graph location – typically
-`/var/lib/docker/devicemapper` – a thin pool is created based on two block
-devices, one for data and one for metadata. By default, these block devices
-are created automatically by using loopback mounts of automatically created
-sparse files. Refer to [Storage driver options](#storage-driver-options) below
-for a way how to customize this setup.
-[~jpetazzo/Resizing Docker containers with the Device Mapper plugin](http://jpetazzo.github.io/2014/01/29/docker-device-mapper-resize/)
-article explains how to tune your existing setup without the use of options.
-
-The `btrfs` driver is very fast for `docker build` - but like `devicemapper`
-does not share executable memory between devices. Use
-`docker -d -s btrfs -g /mnt/btrfs_partition`.
-
-The `zfs` driver is probably not fast as `btrfs` but has a longer track record
-on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
-cached only once. Use `docker -d -s zfs`. To select a different zfs filesystem
-set `zfs.fsname` option as described in [Storage driver options](#storage-driver-options).
-
-The `overlay` is a very fast union filesystem. It is now merged in the main
-Linux kernel as of [3.18.0](https://lkml.org/lkml/2014/10/26/137). Call
-`docker -d -s overlay` to use it.
-
-> **Note:**
-> As promising as `overlay` is, the feature is still quite young and should not
-> be used in production. Most notably, using `overlay` can cause excessive
-> inode consumption (especially as the number of images grows), as well as
-> being incompatible with the use of RPMs.
-
-> **Note:**
-> It is currently unsupported on `btrfs` or any Copy on Write filesystem
-> and should only be used over `ext4` partitions.
-
-### Storage driver options
-
-Particular storage-driver can be configured with options specified with
-`--storage-opt` flags. Options for `devicemapper` are prefixed with `dm` and
-options for `zfs` start with `zfs`.
-
-*  `dm.thinpooldev`
-
-     Specifies a custom block storage device to use for the thin pool.
-
-     If using a block device for device mapper storage, it is best to use `lvm`
-     to create and manage the thin-pool volume. This volume is then handed to Docker
-     to exclusively create snapshot volumes needed for images and containers.  
-
-     Managing the thin-pool outside of Docker makes for the most feature-rich
-     method of having Docker utilize device mapper thin provisioning as the
-     backing storage for Docker's containers. The highlights of the lvm-based
-     thin-pool management feature include: automatic or interactive thin-pool
-     resize support, dynamically changing thin-pool features, automatic thinp
-     metadata checking when lvm activates the thin-pool, etc.
-
-     Example use:
-
-        docker -d --storage-opt dm.thinpooldev=/dev/mapper/thin-pool
-
- *  `dm.basesize`
-
-    Specifies the size to use when creating the base device, which limits the
-    size of images and containers. The default value is 10G. Note, thin devices
-    are inherently "sparse", so a 10G device which is mostly empty doesn't use
-    10 GB of space on the pool. However, the filesystem will use more space for
-    the empty case the larger the device is.
-
-    This value affects the system-wide "base" empty filesystem
-    that may already be initialized and inherited by pulled images. Typically,
-    a change to this value requires additional steps to take effect:
-
-        $ sudo service docker stop
-        $ sudo rm -rf /var/lib/docker
-        $ sudo service docker start
-
-    Example use:
-
-        $ docker -d --storage-opt dm.basesize=20G
-
- *  `dm.loopdatasize`
-
-    >**Note**: This option configures devicemapper loopback, which should not be used in production.
-		
-    Specifies the size to use when creating the loopback file for the
-    "data" device which is used for the thin pool. The default size is
-    100G. The file is sparse, so it will not initially take up this
-    much space.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.loopdatasize=200G
-
- *  `dm.loopmetadatasize`
-
-    >**Note**: This option configures devicemapper loopback, which should not be used in production.
-
-    Specifies the size to use when creating the loopback file for the
-    "metadadata" device which is used for the thin pool. The default size
-    is 2G. The file is sparse, so it will not initially take up
-    this much space.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.loopmetadatasize=4G
-
- *  `dm.fs`
-
-    Specifies the filesystem type to use for the base device. The supported
-    options are "ext4" and "xfs". The default is "ext4"
-
-    Example use:
-
-        $ docker -d --storage-opt dm.fs=xfs
-
- *  `dm.mkfsarg`
-
-    Specifies extra mkfs arguments to be used when creating the base device.
-
-    Example use:
-
-        $ docker -d --storage-opt "dm.mkfsarg=-O ^has_journal"
-
- *  `dm.mountopt`
-
-    Specifies extra mount options used when mounting the thin devices.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.mountopt=nodiscard
-
- *  `dm.datadev`
-
-    (Deprecated, use `dm.thinpooldev`)
-
-    Specifies a custom blockdevice to use for data for the thin pool.
-
-    If using a block device for device mapper storage, ideally both datadev and
-    metadatadev should be specified to completely avoid using the loopback
-    device.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.datadev=/dev/sdb1 --storage-opt dm.metadatadev=/dev/sdc1
-
- *  `dm.metadatadev`
-
-    (Deprecated, use `dm.thinpooldev`)
-
-    Specifies a custom blockdevice to use for metadata for the thin pool.
-
-    For best performance the metadata should be on a different spindle than the
-    data, or even better on an SSD.
-
-    If setting up a new metadata pool it is required to be valid. This can be
-    achieved by zeroing the first 4k to indicate empty metadata, like this:
-
-	$ dd if=/dev/zero of=$metadata_dev bs=4096 count=1
-
-    Example use:
-
-        $ docker -d --storage-opt dm.datadev=/dev/sdb1 --storage-opt dm.metadatadev=/dev/sdc1
-
- *  `dm.blocksize`
-
-    Specifies a custom blocksize to use for the thin pool. The default
-    blocksize is 64K.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.blocksize=512K
-
- *  `dm.blkdiscard`
-
-    Enables or disables the use of blkdiscard when removing devicemapper
-    devices. This is enabled by default (only) if using loopback devices and is
-    required to resparsify the loopback file on image/container removal.
-
-    Disabling this on loopback can lead to *much* faster container removal
-    times, but will make the space used in `/var/lib/docker` directory not be
-    returned to the system for other use when containers are removed.
-
-    Example use:
-
-        $ docker -d --storage-opt dm.blkdiscard=false
-
- *  `dm.override_udev_sync_check`
-
-    Overrides the `udev` synchronization checks between `devicemapper` and `udev`.
-    `udev` is the device manager for the Linux kernel.
-
-    To view the `udev` sync support of a Docker daemon that is using the
-    `devicemapper` driver, run:
-
-        $ docker info
-        [...]
-        Udev Sync Supported: true
-        [...]
-
-    When `udev` sync support is `true`, then `devicemapper` and udev can
-    coordinate the activation and deactivation of devices for containers.
-
-    When `udev` sync support is `false`, a race condition occurs between
-    the`devicemapper` and `udev` during create and cleanup. The race condition
-    results in errors and failures. (For information on these failures, see
-    [docker#4036](https://github.com/docker/docker/issues/4036))
-
-    To allow the `docker` daemon to start, regardless of `udev` sync not being
-    supported, set `dm.override_udev_sync_check` to true:
-
-        $ docker -d --storage-opt dm.override_udev_sync_check=true
-
-    When this value is `true`, the  `devicemapper` continues and simply warns
-    you the errors are happening.
-
-    > **Note:**
-    > The ideal is to pursue a `docker` daemon and environment that does
-    > support synchronizing with `udev`. For further discussion on this
-    > topic, see [docker#4036](https://github.com/docker/docker/issues/4036).
-    > Otherwise, set this flag for migrating existing Docker daemons to
-    > a daemon with a supported environment.
-
-
-## Docker execdriver option
-
-Currently supported options of `zfs`:
-
- * `zfs.fsname`
-
-    Set zfs filesystem under which docker will create its own datasets.
-    By default docker will pick up the zfs filesystem where docker graph
-    (`/var/lib/docker`) is located.
-
-    Example use:
-
-        $ docker -d -s zfs --storage-opt zfs.fsname=zroot/docker
-
-## Docker execdriver option
-
-The Docker daemon uses a specifically built `libcontainer` execution driver as
-its interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`.
-
-There is still legacy support for the original [LXC userspace tools](
-https://linuxcontainers.org/) via the `lxc` execution driver, however, this is
-not where the primary development of new functionality is taking place.
-Add `-e lxc` to the daemon flags to use the `lxc` execution driver.
-
-## Options for the native execdriver
-
-You can configure the `native` (libcontainer) execdriver using options specified
-with the `--exec-opt` flag. All the flag's options have the `native` prefix. A
-single `native.cgroupdriver` option is available.
-
-The `native.cgroupdriver` option specifies the management of the container's
-cgroups. You can specify `cgroupfs` or `systemd`. If you specify `systemd` and
-it is not available, the system uses `cgroupfs`. By default, if no option is
-specified, the execdriver first tries `systemd` and falls back to `cgroupfs`.
-This example sets the execdriver to `cgroupfs`:
-
-    $ sudo docker -d --exec-opt native.cgroupdriver=cgroupfs
-
-Setting this option applies to all containers the daemon launches.
-
-## Daemon DNS options
-
-To set the DNS server for all Docker containers, use
-`docker -d --dns 8.8.8.8`.
-
-To set the DNS search domain for all Docker containers, use
-`docker -d --dns-search example.com`.
-
-## Insecure registries
-
-Docker considers a private registry either secure or insecure. In the rest of
-this section, *registry* is used for *private registry*, and `myregistry:5000`
-is a placeholder example for a private registry.
-
-A secure registry uses TLS and a copy of its CA certificate is placed on the
-Docker host at `/etc/docker/certs.d/myregistry:5000/ca.crt`. An insecure
-registry is either not using TLS (i.e., listening on plain text HTTP), or is
-using TLS with a CA certificate not known by the Docker daemon. The latter can
-happen when the certificate was not found under
-`/etc/docker/certs.d/myregistry:5000/`, or if the certificate verification
-failed (i.e., wrong CA).
-
-By default, Docker assumes all, but local (see local registries below),
-registries are secure. Communicating with an insecure registry is not possible
-if Docker assumes that registry is secure. In order to communicate with an
-insecure registry, the Docker daemon requires `--insecure-registry` in one of
-the following two forms:
-
-* `--insecure-registry myregistry:5000` tells the Docker daemon that
-  myregistry:5000 should be considered insecure.
-* `--insecure-registry 10.1.0.0/16` tells the Docker daemon that all registries
-  whose domain resolve to an IP address is part of the subnet described by the
-  CIDR syntax, should be considered insecure.
-
-The flag can be used multiple times to allow multiple registries to be marked
-as insecure.
-
-If an insecure registry is not marked as insecure, `docker pull`,
-`docker push`, and `docker search` will result in an error message prompting
-the user to either secure or pass the `--insecure-registry` flag to the Docker
-daemon as described above.
-
-Local registries, whose IP address falls in the 127.0.0.0/8 range, are
-automatically marked as insecure as of Docker 1.3.2. It is not recommended to
-rely on this, as it may change in the future.
-
-## Running a Docker daemon behind a HTTPS_PROXY
-
-When running inside a LAN that uses a `HTTPS` proxy, the Docker Hub
-certificates will be replaced by the proxy's certificates. These certificates
-need to be added to your Docker host's configuration:
-
-1. Install the `ca-certificates` package for your distribution
-2. Ask your network admin for the proxy's CA certificate and append them to
-   `/etc/pki/tls/certs/ca-bundle.crt`
-3. Then start your Docker daemon with `HTTPS_PROXY=http://username:password@proxy:port/ docker -d`.
-   The `username:` and `password@` are optional - and are only needed if your
-   proxy is set up to require authentication.
-
-This will only add the proxy and authentication to the Docker daemon's requests -
-your `docker build`s and running containers will need extra configuration to
-use the proxy
-
-## Default Ulimits
-
-`--default-ulimit` allows you to set the default `ulimit` options to use for
-all containers. It takes the same options as `--ulimit` for `docker run`. If
-these defaults are not set, `ulimit` settings will be inherited, if not set on
-`docker run`, from the Docker daemon. Any `--ulimit` options passed to 
-`docker run` will overwrite these defaults.
-
-## Miscellaneous options
-
-IP masquerading uses address translation to allow containers without a public
-IP to talk to other machines on the Internet. This may interfere with some
-network topologies and can be disabled with --ip-masq=false.
-
-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:
-
-    DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/docker -d -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1
-    # or
-    export DOCKER_TMPDIR=/mnt/disk2/tmp
-    /usr/local/bin/docker -d -D -g /var/lib/docker -H unix:// > /var/lib/boot2docker/docker.log 2>&1
-
-
@@ -0,0 +1,357 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Configuration options
+page_description: Configuration instructions for Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry
+
+# Configuring DHE
+
+## Overview
+
+This page will help you properly configure Docker Hub Enterprise (DHE) so it can
+run in your environment. 
+
+Start with DHE loaded in your browser and click  the "Settings" tab to view
+configuration options. You'll see options for configuring:
+
+* Domains and ports
+* Security settings
+* Storage settings
+* Authentication settings
+* Your DHE license
+
+## Domains and Ports
+
+![Domain and Ports page</admin/settings#http>](../assets/admin-settings-http.png)
+
+* *Domain Name*: **required** defaults to an empty string, the fully qualified domain name assigned to the DHE host.
+* *Load Balancer HTTP Port*: defaults to 80, used as the entry point for the image storage service. To see load balancer status, you can query
+http://&lt;dhe-host&gt;/load_balancer_status.
+* *Load Balancer HTTPS Port*: defaults to 443, used as the secure entry point
+for the image storage service.
+* *HTTP_PROXY*: defaults to an empty string, proxy server for HTTP requests.
+* *HTTPS_PROXY*: defaults to an empty string, proxy server for HTTPS requests.
+* *NO_PROXY*: defaults to an empty string, proxy bypass for HTTP and HTTPS requests.
+
+
+> **Note**: If you need DHE to re-generate a self-signed certificate at some
+> point, you'll need to first delete `/usr/local/etc/dhe/ssl/server.pem`, and
+> then restart the DHE containers, either by changing and saving the "Domain Name",
+> or using `bash -c "$(docker run dockerhubenterprise/manager restart)"`.
+
+
+## Security
+
+![Security settings page</admin/settings#security>](../assets/admin-settings-security.png)
+
+* *SSL Certificate*: Used to enter the hash (string) from the SSL Certificate.
+This cert must be accompanied by its private key, entered below.
+* *Private Key*: The hash from the private key associated with the provided
+SSL Certificate (as a standard x509 key pair).
+
+In order to run, DHE requires encrypted communications via HTTPS/SSL between (a) the DHE registry and your Docker Engine(s), and (b) between your web browser and the DHE admin server. There are a few options for setting this up:
+
+1. You can use the self-signed certificate DHE generates by default.
+2. You can generate your own certificates using a public service or your enterprise's infrastructure. See the [Generating SSL certificates](#generating-ssl-certificates) section for the options available.
+
+If you are generating your own certificates, you can install them by following the instructions for
+[Adding your own registry certificates to DHE](#adding-your-own-registry-certificates-to-dhe).
+
+On the other hand, if you choose to use the DHE-generated certificates, or the
+certificates you generate yourself are not trusted by your client Docker hosts,
+you will need to do one of the following:
+
+* [Install a registry certificate on all of your client Docker daemons](#installing-registry-certificates-on-client-docker-daemons),
+
+* Set your [client Docker daemons to run with an unconfirmed connection to the registry](#if-you-cant-install-the-certificates).
+
+### Generating SSL certificates
+
+There are three basic approaches to generating certificates:
+
+1.  Most enterprises will have private key infrastructure (PKI) in place to
+generate keys. Consult with your security team or whomever manages your private
+key infrastructure. If you have this resource available, Docker recommends you
+use it.
+
+2. If your enterprise can't provide keys, you can use a public Certificate
+Authority (CA) like "InstantSSL.com" or "RapidSSL.com" to generate a
+certificate. If your certificates are generated using a globally trusted
+Certificate Authority, you won't need to install them on all of your
+client Docker daemons.
+
+3. Use the self-signed registry certificate generated by DHE, and install it
+onto the client Docker daemon hosts as shown below.
+
+### Adding your own Registry certificates to DHE
+
+Whichever method you use to generate certificates, once you have them
+you can set up your DHE server to use them by navigating to the "Settings" page,
+going to "Security," and putting the SSL Certificate text (including all
+intermediate Certificates, starting with the host) into the
+"SSL Certificate" edit box, and the previously generated Private key into
+the "SSL Private Key" edit box.
+
+Click the "Save" button, and then wait for the DHE Admin site to restart and
+reload. It should now be using the new certificate.
+
+Once the "Security" page has reloaded, it will show `#` hashes instead of the
+certificate text you pasted in.
+
+If your certificate is signed by a chain of Certificate Authorities that are
+already trusted by your Docker daemon servers, you can skip the "Installing
+registry certificates" step below.
+
+### Installing Registry certificates on client Docker daemons
+
+If your certificates do not have a trusted Certificate Authority, you will need
+to install them on each client Docker daemon host.
+
+The procedure for installing the DHE certificates on each Linux distribution has
+slightly different steps, as shown below.
+
+You can test this certificate using `curl`:
+
+```
+$ curl https://dhe.yourdomain.com/v2/
+curl: (60) SSL certificate problem: self signed certificate
+More details here: http://curl.haxx.se/docs/sslcerts.html
+
+curl performs SSL certificate verification by default, using a "bundle"
+ of Certificate Authority (CA) public keys (CA certs). If the default
+ bundle file isn't adequate, you can specify an alternate file
+ using the --cacert option.
+If this HTTPS server uses a certificate signed by a CA represented in
+ the bundle, the certificate verification probably failed due to a
+ problem with the certificate (it might be expired, or the name might
+ not match the domain name in the URL).
+If you'd like to turn off curl's verification of the certificate, use
+ the -k (or --insecure) option.
+
+$ curl --cacert /usr/local/etc/dhe/ssl/server.pem https://dhe.yourdomain.com/v2/
+{"errors":[{"code":"UNAUTHORIZED","message":"access to the requested resource is not authorized","detail":null}]}
+```
+
+Continue by following the steps corresponding to your chosen OS.
+
+#### Ubuntu/Debian
+
+```
+    $ export DOMAIN_NAME=dhe.yourdomain.com
+    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /usr/local/share/ca-certificates/$DOMAIN_NAME.crt
+    $ sudo update-ca-certificates
+    Updating certificates in /etc/ssl/certs... 1 added, 0 removed; done.
+    Running hooks in /etc/ca-certificates/update.d....done.
+    $ sudo service docker restart
+    docker stop/waiting
+    docker start/running, process 29291
+```
+
+#### RHEL
+
+```
+    $ export DOMAIN_NAME=dhe.yourdomain.com
+    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /etc/pki/ca-trust/source/anchors/$DOMAIN_NAME.crt
+    $ sudo update-ca-trust
+    $ sudo /bin/systemctl restart docker.service
+```
+
+#### Boot2Docker 1.6.0
+
+Install the CA cert (or the auto-generated cert) by adding the following to
+your `/var/lib/boot2docker/bootsync.sh`:
+
+```
+#!/bin/sh
+
+cat /var/lib/boot2docker/server.pem >> /etc/ssl/certs/ca-certificates.crt
+```
+
+
+Then get the certificate from the new DHE server using:
+
+```
+$ openssl s_client -connect dhe.yourdomain.com:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee -a /var/lib/boot2docker/server.pem
+```
+
+If your certificate chain is complicated, you may want to use the changes in
+[Pull request 807](https://github.com/boot2docker/boot2docker/pull/807/files)
+
+Now you can either reboot your Boot2Docker virtual machine, or run the following to
+install the server certificate, and then restart the Docker daemon.
+
+```
+$ sudo chmod 755 /var/lib/boot2docker/bootsync.sh
+$ sudo /var/lib/boot2docker/bootsync.sh
+$ sudo /etc/init.d/docker restart`.
+```
+
+### If you can't install the certificates
+
+If for some reason you can't install the certificate chain on a client Docker host,
+or your certificates do not have a global CA, you can configure your Docker daemon to run in "insecure" mode. This is done by adding an extra flag,
+`--insecure-registry host-ip|domain-name`, to your client Docker daemon startup flags.
+You'll need to restart the Docker daemon for the change to take effect.
+
+This flag means that the communications between your Docker client and the DHE
+Registry server are still encrypted, but the client Docker daemon is not
+confirming that the Registry connection is not being hijacked or diverted.
+
+> **Note**: If you enter a "Domain Name" into the "Security" settings, it needs
+> to be DNS resolvable on any client Docker daemons that are running in
+> "insecure-registry" mode.
+
+To set the flag, follow the directions below for your operating system.
+
+#### Ubuntu
+
+On Ubuntu 14.04 LTS, you customize the Docker daemon configuration with the
+`/etc/defaults/docker` file.
+
+Open or create the `/etc/defaults/docker` file, and add the
+`--insecure-registry` flag to the `DOCKER_OPTS` setting (which may need to be
+added or uncommented) as follows:
+
+```
+DOCKER_OPTS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo service docker restart`.
+
+#### RHEL
+
+On RHEL, you customize the Docker daemon configuration with the
+`/etc/sysconfig/docker` file.
+
+Open or create the `/etc/sysconfig/docker` file, and add the
+`--insecure-registry` flag to the `OPTIONS` setting (which may need to be
+added or uncommented) as follows:
+
+```
+OPTIONS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo service docker restart`.
+
+### Boot2Docker
+
+On Boot2Docker, you customize the Docker daemon configuration with the
+`/var/lib/boot2docker/profile` file.
+
+Open or create the `/var/lib/boot2docker/profile` file, and add an `EXTRA_ARGS`
+setting as follows:
+
+```
+EXTRA_ARGS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo /etc/init.d/docker restart`.
+
+## Image Storage Configuration
+
+DHE offers multiple methods for image storage, which are defined using specific
+storage drivers. Image storage can be local, remote, or on a cloud service such
+as S3. Storage drivers can be added or customized via the DHE storage driver
+API.
+
+![Storage settings page</admin/settings#storage>](../assets/admin-settings-storage.png)
+
+* *Yaml configuration file*: This file (`/usr/local/etc/dhe/storage.yml`) is
+used to configure the image storage services. The editable text of the file is
+displayed in the dialog box. The schema of this file is identical to that used
+by the [Registry 2.0](https://docs.docker.com/registry/configuration/).
+* If you are using the file system driver to provide local image storage, you will need to specify a root directory which will get mounted as a sub-path of
+`/var/local/dhe/image-storage`. The default value of this root directory is
+`/local`, so the full path to it is `/var/local/dhe/image-storage/local`.
+
+> **Note:**
+> Saving changes you've made to settings will restart the Docker Hub Enterprise
+> instance. The restart may cause a brief interruption for users of the image
+> storage system.
+
+## Authentication
+
+The "Authentication" settings tab lets DHE administrators control access
+to the DHE web admin tool and to the DHE Registry.
+
+The current authentication methods are `None`, `Basic` and `LDAP`.
+
+> **Note**: if you have issues logging into the DHE admin web interface after changing the authentication
+> settings, you may need to use the [emergency access to the DHE admin web interface](./adminguide.md#Emergency-access-to-the-dhe-admin-web-interface).
+
+### No authentication
+
+No authentication means that everyone that can access your DHE web administration
+site. This is not recommended for any use other than testing.
+
+
+### Basic authentication
+
+The `Basic` authentication setting allows the admin to provide username/password pairs local to DHE.
+Any user who can successfully authenticate can use DHE to push and pull Docker images.
+You can optionally filter the list of users to a subset of just those users with access to the DHE
+admin web interface.
+
+![Basic authentication settings page</admin/settings#auth>](../assets/admin-settings-authentication-basic.png)
+
+* A button to add one user, or to upload a CSV file containing username,
+password pairs
+* A DHE website Administrator Filter, allowing you to either
+* * *Allow all authenticated users*: to log into the DHE admin web interface, or
+* * *Whitelist usernames*: which allows you to restrict access to the web interface to a listed set of users.
+
+### LDAP authentication
+
+Using LDAP authentication allows you to integrate your DHE registry into your
+organization's existing user and authentication database.
+
+As this involves existing infrastructure external to DHE and Docker, you will need to
+gather the details required to configure DHE for your organization's particular LDAP
+implementation.
+
+You can test that you have the necessary LDAP server information by using it from
+inside a Docker container running on the same server as your DHE:
+
+> **Note**: if the LDAP server is configured to use *StartTLS*, then you need to add `-Z` to the
+> `ldapsearch` command examples below.
+
+```
+docker run --rm -it svendowideit/ldapsearch -h <LDAP Server hostname> -b <User Base DN> -D <Search User DN> -w <Search User Password>
+```
+
+or if the LDAP server is set up to allow anonymous access (which means your *Search User DN* and *Search User Password* settings can remain empty):
+
+```
+docker run --rm -it svendowideit/ldapsearch -h <LDAP Server hostname> -b <User Base DN> -x
+```
+
+The result of these queries should be a (very) long list - if you get an authentication error,
+then the details you have been given are not sufficient.
+
+The *User Login Attribute* key setting must match the field used in the LDAP server
+for the user's login-name. On OpenLDAP, it's generally `uid`, and on Microsoft Active Directory
+servers, it's `sAMAccountName`. The `ldapsearch` output above should allow you to
+confirm which setting you need.
+
+![LDAP authentication settings page</admin/settings#auth>](../assets/admin-settings-authentication-ldap.png)
+
+* *Use StartTLS*: defaults to unchecked, check to enable StartTLS
+* *LDAP Server URL*: **required** defaults to null, LDAP server URL (e.g., - ldap://example.com)
+* *User Base DN*: **required** defaults to null, user base DN in the form (e.g., - dc=example,dc=com)
+* *User Login Attribute*: **required** defaults to null, user login attribute (e.g., - uid or sAMAccountName)
+* *Search User DN*: **required** defaults to null, search user DN (e.g., - domain\username)
+* *Search User Password*: **required** defaults to null, search user password
+* A *DHE Registry User filter*: allowing you to either
+* * *Allow all authenticated users* to push or pull any images, or
+* * *Filter LDAP search results*: which allows you to restrict DHE registry pull and push to users matching the LDAP filter,
+* * *Whitelist usernames*: which allows you to restrict DHE registry pull and push to the listed set of users.
+* A *DHE website Administrator filter*, allowing you to either
+* * *Allow all authenticated users*: to log into the DHE admin web interface, or
+* * *Filter LDAP search results*: which allows you to restrict DHE admin web access to users matching the LDAP filter,
+* * *Whitelist usernames*: which allows you to restrict access to the web interface to the listed set of users.
+
+
+## Next Steps
+
+For information on getting support for DHE, take a look at the
+[Support information](./support.md).
+
@@ -0,0 +1,331 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Quick-start: Basic Workflow
+page_description: Brief tutorial on the basics of Docker Hub Enterprise user workflow
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, image, repository
+
+
+# Docker Hub Enterprise Quick Start: Basic User Workflow
+
+## Overview
+
+This Quick Start Guide will give you a hands-on look at the basics of using
+Docker Hub Enterprise (DHE), Docker's on-premise image storage application.
+This guide will walk you through using DHE to complete a typical, and critical,
+part of building a development pipeline: setting up a Jenkins instance. Once you
+complete the task, you should have a good idea of how DHE works and how it might
+be useful to you.
+
+Specifically, this guide demonstrates the process of retrieving the
+[official Docker image for Jenkins](https://registry.hub.docker.com/_/jenkins/),
+customizing it to suit your needs, and then hosting it on your private instance
+of DHE located inside your enterprise's firewalled environment. Your developers
+will then be able to retrieve the custom Jenkins image in order to use it to
+build CI/CD infrastructure for their projects, no matter the platform they're
+working from, be it a laptop, a VM, or a cloud provider.
+
+The guide will walk you through the following steps:
+
+1. Pulling the official Jenkins image from the public Docker Hub
+2. Customizing the Jenkins image to suit your needs
+3. Pushing the customized image to DHE
+4. Pulling the customized image from DHE
+4. Launching a container from the custom image
+5. Using the new Jenkins container
+
+You should be able to complete this guide in about thirty minutes.
+
+> **Note:** This guide assumes you have installed a working instance of DHE
+> reachable at dhe.yourdomain.com. If you need help installing and configuring
+> DHE, please consult the
+[installation instructions](./install.md).
+
+
+## Pulling the official Jenkins image
+
+> **Note:** This guide assumes you are familiar with basic Docker concepts such
+> as images, containers, and registries. If you need to learn more about Docker
+> fundamentals, please consult the
+> [Docker user guide](https://docs.docker.com/userguide/).
+
+First, you will retrieve a copy of the official Jenkins image from the Docker Hub. By default, if
+Docker can't find an image locally, it will attempt to pull the image from the
+Docker Hub. From the CLI of a machine running the Docker Engine on your network, use
+the
+[`docker pull`](https://docs.docker.com/reference/commandline/cli/#pull)
+command to pull the public Jenkins image.
+
+    $ docker pull jenkins
+
+> **Note:** This guide assumes you can run Docker commands from a machine where
+> you are a member of the `docker` group, or have root privileges. Otherwise, you may
+> need to add `sudo` to the example commands below.
+
+Docker will start the process of pulling the image from the Hub. Once it has completed, the Jenkins image should be visible in the output of a [`docker images`](https://docs.docker.com/reference/commandline/cli/#images) command, which lists your available images:
+
+    $ docker images
+    REPOSITORY  TAG     IMAGE ID      CREATED      VIRTUAL SIZE
+    jenkins     latest  1a7cc22b0ee9  6 days ago   662 MB
+
+> **Note:** Because the `pull` command did not specify any tags, it will pull
+> the latest version of the public Jenkins image. If your enterprise environment
+> requires you to use a specific version, add the tag for the version you need
+> (e.g., `jenkins:1.565`).
+
+## Customizing the Jenkins image
+
+Now that you have a local copy of the Jenkins image, you'll customize it so that
+the containers it builds will integrate with your infrastructure. To do this,
+you'll create a custom Docker image that adds a Jenkins plugin that provides
+fine grained user management. You'll also configure Jenkins to be more secure by
+disabling HTTP access and forcing it to use HTTPS.
+You'll do this by using a `Dockerfile` and the `docker build` command.
+
+> **Note:** These are obviously just a couple of examples of the many ways you
+> can modify and configure Jenkins. Feel free to add or substitute whatever
+> customization is necessary to run Jenkins in your environment.
+
+### Creating a `build` context
+
+In order to add the new plugin and configure HTTPS access to the custom Jenkins
+image, you need to:
+
+1. Create text file that defines the new plugin
+2. Create copies of the private key and certificate
+
+All of the above files need to be in the same directory as the Dockerfile you
+will create in the next step.
+
+1. Create a build directory called `build`, and change to that new directory:
+
+    $ mkdir build && cd build
+
+In this directory, create a new file called `plugins` and add the following
+line:
+
+    role-strategy:2.2.0
+
+(The plugin version used above was the latest version at the time of writing.)
+
+2. You will also need to make copies of the server's private key and certificate. Give the copies the following names - `https.key` and `https.pem`.
+
+> **Note:** Because creating new keys varies widely by platform and
+> implementation, this guide won't cover key generation. We assume you have
+> access to existing keys. If you don't have access, or can't generate keys
+> yourself, feel free to skip the steps involving them and HTTPS config. The
+> guide will still walk you through building a custom Jenkins image and pushing
+> and pulling that image using DHE.
+
+### Creating a Dockerfile
+
+In the same directory as the `plugins` file and the private key and certificate,
+create a new [`Dockerfile`](https://docs.docker.com/reference/builder/) with the
+following contents:
+
+     FROM jenkins
+
+     #New plugins must be placed in the plugins file
+     COPY plugins /usr/share/jenkins/plugins
+
+     #The plugins.sh script will install new plugins
+     RUN /usr/local/bin/plugins.sh /usr/share/jenkins/plugins
+
+     #Copy private key and cert to image
+     COPY https.pem /var/lib/jenkins/cert
+     COPY https.key /var/lib/jenkins/pk
+
+     #Configure HTTP off and HTTPS on, using port 1973
+    ENV JENKINS_OPTS --httpPort=-1 --httpsPort=1973 --httpsCertificate=/var/lib/jenkins/cert --httpsPrivateKey=/var/lib/jenkins/pk
+
+The first `COPY` instruction in the above will copy the `plugin` file created
+earlier into the `/usr/share/jenkins` directory within the custom image you are
+defining with the `Dockerfile`.
+
+The `RUN` instruction will execute the `/usr/local/bin/plugins.sh` script with
+the newly copied `plugins` file, which will install the listed plugin.
+
+The next two `COPY` instructions copy the server's private key and certificate
+into the required directories within the new image.
+
+The `ENV` instruction creates an environment variable called `JENKINS_OPT` in
+the image you are about to create. This environment variable will be present in
+any containers launched form the image and contains the required settings to
+tell Jenkins to disable HTTP and operate over HTTPS.
+
+> **Note:** You can specify any valid port number as part of the `JENKINS_OPT`
+> environment variable declared above. The value `1973` used in the example is
+> arbitrary.
+
+The `Dockerfile`, the `plugins` file, as well as the private key and
+certificate, must all be in the same directory because the `docker build`
+command uses the directory that contains the `Dockerfile` as its "build
+context". Only files contained within that "build context" will be included in
+the image being built.
+
+### Building your custom image
+
+Now that the `Dockerfile`, the `plugins` file, and the files required for HTTPS
+operation are created in your current working directory, you can build your
+custom image using the
+[`docker build` command](https://docs.docker.com/reference/commandline/cli/#build):
+
+    docker build -t dhe.yourdomain.com/ci-infrastructure/jnkns-img .
+
+> **Note:** Don't miss the period (`.`) at the end of the command above. This
+> tells the `docker build` command to use the current working directory as the
+> "build context".
+
+This command will build a new Docker image called `jnkns-img` which is based on
+the public Jenkins image you pulled earlier, but contains all of your
+customization.
+
+Please note the use of the `-t` flag in the `docker build` command above. The
+`-t` flag lets you  tag an image so it can be pushed to a custom repository. In
+the example above, the new image is tagged so it can be pushed to the
+`ci-infrastructure` Repository within the `dhe.yourdomain.com` registry (your
+local DHE instance). This will be important when you need to `push` the
+customized image to DHE later.
+
+A `docker images` command will now show the custom image alongside the Jenkins
+image pulled earlier:
+
+    $ sudo docker images
+    REPOSITORY   TAG    IMAGE ID    CREATED    VIRTUAL SIZE
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img    latest    fc0ab3008d40    2 minutes ago    674.5 MB
+    jenkins    latest    1a7cc22b0ee9    6 days ago    662 MB
+
+## Pushing to Docker Hub Enterprise
+
+> **Note**: If your DHE instance has authentication enabled, you will need to
+> use your command line to `docker login <dhe-hostname>` (e.g., `docker login
+> dhe.yourdomain.com`).
+>
+> Failures due to unauthenticated `docker push` and `docker pull` commands will
+> look like :
+>
+>     $ docker pull dhe.yourdomain.com/hello-world
+>     Pulling repository dhe.yourdomain.com/hello-world
+>     FATA[0001] Error: image hello-world:latest not found
+>
+>     $ docker push dhe.yourdomain.com/hello-world
+>     The push refers to a repository [dhe.yourdomain.com/hello-world] (len: 1)
+>     e45a5af57b00: Image push failed
+>     FATA[0001] Error pushing to registry: token auth attempt for registry
+>     https://dhe.yourdomain.com/v2/:
+>     https://dhe.yourdomain.com/auth/v2/token/
+>     ?scope=repository%3Ahello-world%3Apull%2Cpush&service=dhe.yourdomain.com
+>     request failed with status: 401 Unauthorized
+
+Now that you've created the custom image, it can be pushed to DHE using the
+[`docker push`command](https://docs.docker.com/reference/commandline/cli/#push):
+
+    $ docker push dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    511136ea3c5a: Image successfully pushed
+    848d84b4b2ab: Image successfully pushed
+    71d9d77ae89e: Image already exists
+    <truncated ouput...>
+    492ed3875e3e: Image successfully pushed
+    fc0ab3008d40: Image successfully pushed
+
+You can view the traffic throughput while the custom image is being pushed from
+the `System Health` tab in DHE:
+
+![DHE console push throughput](../assets/console-push.png)
+
+Once the image is successfully pushed, it can be downloaded, or pulled, by any
+Docker host that has access to DHE.
+
+## Pulling from Docker Hub Enterprise
+To pull the `jnkns-img` image from DHE, run the
+[`docker pull`](https://docs.docker.com/reference/commandline/cli/#pull)
+command from any Docker Host that has access to your DHE instance:
+
+    $ docker pull dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    latest: Pulling from dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    511136ea3c5a: Pull complete
+    848d84b4b2ab: Pull complete
+    71d9d77ae89e: Pull complete
+    <truncated ouput...>
+    492ed3875e3e: Pull complete
+    fc0ab3008d40: Pull complete
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
+    Status: Downloaded newer image for dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest
+
+You can view the traffic throughput while the custom image is being pulled from
+the `System Health` tab in DHE:
+
+![DHE console pull throughput](../assets/console-pull.png)
+
+Now that the `jnkns-img` image has been pulled locally from DHE, you can view it
+in the output of the `docker images` command:
+
+     $ docker images
+    REPOSITORY     TAG    IMAGE ID    CREATED    VIRTUAL SIZE
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img    latest  fc0ab3008d40    8 minutes ago    674.5 MB
+
+## Launching a custom Jenkins container
+
+Now that you've successfully pulled the customized Jenkins image from DHE, you
+can create a container from it with the
+[`docker run` command](https://docs.docker.com/reference/commandline/cli/#run):
+
+
+    $ docker run -p 1973:1973 --name jenkins01 dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    /usr/share/jenkins/ref/init.groovy.d/tcp-slave-angent-port.groovy
+     /usr/share/jenkins/ref/init.groovy.d/tcp-slave-angent-port.groovy -> init.groovy.d/tcp-slave-angent-port.groovy
+    copy init.groovy.d/tcp-slave-angent-port.groovy to JENKINS_HOME
+    /usr/share/jenkins/ref/plugins/role-strategy.hpi
+     /usr/share/jenkins/ref/plugins/role-strategy.hpi -> plugins/role-strategy.hpi
+    copy plugins/role-strategy.hpi to JENKINS_HOME
+    /usr/share/jenkins/ref/plugins/dockerhub.hpi
+     /usr/share/jenkins/ref/plugins/dockerhub.hpi -> plugins/dockerhub.hpi
+    copy plugins/dockerhub.hpi to JENKINS_HOME
+    <truncated output...>
+    INFO: Jenkins is fully up and running
+
+> **Note:** The `docker run` command above maps port 1973 in the container
+> through to port 1973 on the host. This is the HTTPS port you specified in the
+> Dockerfile earlier. If you specified a different HTTPS port in your
+> Dockerfile, you will need to substitute this with the correct port numbers for
+> your environment.
+
+You can view the newly launched a container, called `jenkins01`, using the
+[`docker ps` command](https://docs.docker.com/reference/commandline/cli/#ps):
+
+    $ docker ps
+    CONTAINER ID     IMAGE     COMMAND     CREATED      STATUS  ...PORTS     NAMES
+    2e5d2f068504    dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest    "/usr/local/bin/jenk     About a minute ago     Up About a minute     50000/tcp, 0.0.0.0:1973->1973/tcp     jenkins01
+
+
+## Accessing the new Jenkins container
+
+The previous `docker run` command mapped port `1973` on the container to port
+`1973` on the Docker host, so the Jenkins Web UI can be accessed at
+`https://<docker-host>:1973` (Don't forget the `s` at the end of `https`.)
+
+> **Note:** If you are using a self-signed certificate, you may get a security
+> warning from your browser telling you that the certificate is self-signed and
+> not trusted. You may wish to add the certificate to the trusted store in order
+> to prevent further warnings in the future.
+
+![Jenkins landing page](../assets/jenkins-ui.png)
+
+From within the Jenkins Web UI, navigate to `Manage Jenkins` (on the left-hand
+pane) > `Manage Plugins` > `Installed`. The  `Role-based Authorization Strategy`
+plugin should be present with the `Uninstall` button available to the right.
+
+![Jenkins plugin manager](../assets/jenkins-plugins.png)
+
+In another browser session, try to access Jenkins via the default HTTP port 8080
+ `http://<docker-host>:8080`. This should result in a "connection timeout",
+showing that Jenkins is not available on its default port 8080 over HTTP.
+
+This demonstration shows your Jenkins image has been configured correctly for
+HTTPS access, your new plugin was added and is ready for use, and HTTP access
+has been disabled. At this point, any member of your team can use `docker pull`
+to access the image from your DHE instance, allowing them to access a
+configured, secured Jenkins instance that can run on any infrastructure.
+
+## Next Steps
+
+For more information on using DHE, take a look at the
+[User's Guide](./userguide.md).
@@ -0,0 +1,241 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Release notes
+page_description: Release notes for Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, release
+
+# Release Notes
+
+## Docker Hub Enterprise
+
+### DHE 1.0.1
+(11 May 2015)
+
+- Addresses compatibility issue with 1.6.1 CS Docker Engine
+
+### DHE 1.0.0
+(23 Apr 2015)
+
+- First release
+
+## Commercially Supported Docker Engine
+
+### CS Docker Engine 1.6.2-cs5
+(21 May 2015)
+
+For customers running Docker Engine on [supported versions of RedHat Enterprise
+Linux](https://www.docker.com/enterprise/support/) with [SELinux
+enabled](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/
+6/html/Security-Enhanced_Linux/sect-Security-Enhanced_Linux-Working_with_SELinux
+-Enabling_and_Disabling_SELinux.html), the `docker build` and `docker run`
+commands will not have DNS host name resolution and bind-mounted volumes may
+not be accessible.
+As a result, customers with SELinux will be unable to use hostname-based network
+access in either `docker build` or `docker run`, nor will they be able to
+`docker run` containers
+that use `--volume` or `-v` bind-mounts (with an incorrect SELinux label) in
+their environment. By installing Docker
+Engine 1.6.2-cs5, customers can use Docker as intended on RHEL with SELinux enabled.
+
+For example, you see will failures like:
+
+```
+[root@dhe ~]# docker -v
+Docker version 1.6.0-cs2, build b8dd430
+[root@dhe ~]# ping dhe.home.org.au
+PING dhe.home.org.au (10.10.10.104) 56(84) bytes of data.
+64 bytes from dhe.home.gateway (10.10.10.104): icmp_seq=1 ttl=64 time=0.663 ms
+^C
+--- dhe.home.org.au ping statistics ---
+2 packets transmitted, 2 received, 0% packet loss, time 1001ms
+rtt min/avg/max/mdev = 0.078/0.370/0.663/0.293 ms
+[root@dhe ~]# docker run --rm -it debian ping dhe.home.org.au
+ping: unknown host
+[root@dhe ~]# docker run --rm -it debian cat /etc/resolv.conf
+cat: /etc/resolv.conf: Permission denied
+[root@dhe ~]# docker run --rm -it debian apt-get update
+Err http://httpredir.debian.org jessie InRelease
+
+Err http://security.debian.org jessie/updates InRelease
+
+Err http://httpredir.debian.org jessie-updates InRelease
+
+Err http://security.debian.org jessie/updates Release.gpg
+  Could not resolve 'security.debian.org'
+Err http://httpredir.debian.org jessie Release.gpg
+  Could not resolve 'httpredir.debian.org'
+Err http://httpredir.debian.org jessie-updates Release.gpg
+  Could not resolve 'httpredir.debian.org'
+[output truncated]
+
+```
+
+or when running a `docker build`:
+
+```
+[root@dhe ~]# docker build .
+Sending build context to Docker daemon 11.26 kB
+Sending build context to Docker daemon
+Step 0 : FROM fedora
+ ---> e26efd418c48
+Step 1 : RUN yum install httpd
+ ---> Running in cf274900ea35
+
+One of the configured repositories failed (Fedora 21 - x86_64),
+and yum doesn't have enough cached data to continue. At this point the only
+safe thing yum can do is fail. There are a few ways to work "fix" this:
+
+[output truncated]
+```
+
+
+**Affected Versions**: All previous versions of Docker Engine when SELinux
+is enabled.
+
+Docker **highly recommends** that all customers running previous versions of
+Docker Engine update to this release.
+
+#### **How to workaround this issue**
+
+Customers who choose not to install this update have two options. The
+first option is to disable SELinux. This is *not recommended* for production
+systems where SELinux is typically required.
+
+The second option is to pass the following parameter in to `docker run`.
+
+  	     --security-opt=label:type:docker_t
+
+This parameter cannot be passed to the `docker build` command.
+
+#### **Upgrade notes**
+
+When upgrading, make sure you stop DHE first, perform the Engine upgrade, and
+then restart DHE.
+
+If you are running with SELinux enabled, previous Docker Engine releases allowed
+you to bind-mount additional volumes or files inside the container as follows:
+
+		$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro <imagename>
+
+In the 1.6.2-cs5 release, you must ensure additional bind-mounts have the correct
+SELinux context. For example, if you want to mount `foobar.txt` as read-only
+into the container, do the following to create and test your bind-mount:
+
+1. Add the `z` option to the bind mount when you specify `docker run`.
+
+		$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro,z <imagename>
+
+2. Exec into your new container.
+
+	For example, if your container is `bashful_curie`, open a shell on the
+	container:
+
+		$ docker exec -it bashful_curie bash
+
+3. Use `cat` to check the permissions on the mounted file.
+
+		$ cat /foobar.txt
+		the contents of foobar appear
+
+	If you see the file's contents, your mount succeeded. If you receive a
+	`Permission denied` message and/or the `/var/log/audit/audit.log` file on
+	your Docker host contains an AVC Denial message, the mount did not succeed.
+
+		type=AVC msg=audit(1432145409.197:7570): avc:  denied  { read } for  pid=21167 comm="cat" name="foobar.txt" dev="xvda2" ino=17704136 scontext=system_u:system_r:svirt_lxc_net_t:s0:c909,c965 tcontext=unconfined_u:object_r:user_home_t:s0 tclass=file
+
+	Recheck your command line to make sure you passed in the `z` option.
+
+
+### CS Docker Engine 1.6.2-cs4
+(13 May 2015)
+
+Fix mount regression for `/sys`.
+
+### CS Docker Engine 1.6.1-cs3
+(11 May 2015)
+
+Docker Engine version 1.6.1 has been released to address several vulnerabilities
+and is immediately available for all supported platforms. Users are advised to
+upgrade existing installations of the Docker Engine and use 1.6.1 for new installations.
+
+It should be noted that each of the vulnerabilities allowing privilege escalation
+may only be exploited by a malicious Dockerfile or image.  Users are advised to
+run their own images and/or images built by trusted parties, such as those in
+the official images library.
+
+Please send any questions to security@docker.com.
+
+
+#### **[CVE-2015-3629](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3629) Symlink traversal on container respawn allows local privilege escalation**
+
+Libcontainer version 1.6.0 introduced changes which facilitated a mount namespace
+breakout upon respawn of a container. This allowed malicious images to write
+files to the host system and escape containerization.
+
+Libcontainer and Docker Engine 1.6.1 have been released to address this
+vulnerability. Users running untrusted images are encouraged to upgrade Docker Engine.
+
+Discovered by Tõnis Tiigi.
+
+
+#### **[CVE-2015-3627](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3627) Insecure opening of file-descriptor 1 leading to privilege escalation**
+
+The file-descriptor passed by libcontainer to the pid-1 process of a container
+has been found to be opened prior to performing the chroot, allowing insecure
+open and symlink traversal. This allows malicious container images to trigger
+a local privilege escalation.
+
+Libcontainer and Docker Engine 1.6.1 have been released to address this
+vulnerability. Users running untrusted images are encouraged to upgrade
+Docker Engine.
+
+Discovered by Tõnis Tiigi.
+
+#### **[CVE-2015-3630](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3630) Read/write proc paths allow host modification & information disclosure**
+
+Several paths underneath /proc were writable from containers, allowing global
+system manipulation and configuration. These paths included `/proc/asound`,
+`/proc/timer_stats`, `/proc/latency_stats`, and `/proc/fs`.
+
+By allowing writes to `/proc/fs`, it has been noted that CIFS volumes could be
+forced into a protocol downgrade attack by a root user operating inside of a
+container. Machines having loaded the timer_stats module were vulnerable to
+having this mechanism enabled and consumed by a container.
+
+We are releasing Docker Engine 1.6.1 to address this vulnerability. All
+versions up to 1.6.1 are believed vulnerable. Users running untrusted
+images are encouraged to upgrade.
+
+Discovered by Eric Windisch of the Docker Security Team.
+
+#### **[CVE-2015-3631](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3631) Volume mounts allow LSM profile escalation**
+
+By allowing volumes to override files of `/proc` within a mount namespace, a user
+could specify arbitrary policies for Linux Security Modules, including setting
+an unconfined policy underneath AppArmor, or a `docker_t` policy for processes
+managed by SELinux. In all versions of Docker up until 1.6.1, it is possible for
+malicious images to configure volume mounts such that files of proc may be overridden.
+
+We are releasing Docker Engine 1.6.1 to address this vulnerability. All versions
+up to 1.6.1 are believed vulnerable. Users running untrusted images are encouraged
+to upgrade.
+
+Discovered by Eric Windisch of the Docker Security Team.
+
+#### **AppArmor policy improvements**
+
+The 1.6.1 release also marks preventative additions to the AppArmor policy.
+Recently, several CVEs against the kernel have been reported whereby mount
+namespaces could be circumvented through the use of the sys_mount syscall from
+inside of an unprivileged Docker container. In all reported cases, the
+AppArmor policy included in libcontainer and shipped with Docker has been
+sufficient to deflect these attacks. However, we have deemed it prudent to
+proactively tighten the policy further by outright denying the use of the
+`sys_mount` syscall.
+
+Because this addition is preventative, no CVE-ID is requested.
+
+### CS Docker Engine 1.6.0-cs2
+(23 Apr 2015)
+
+- First release, please see the [Docker Engine 1.6.0 Release notes](/release-notes/)
+  for more details.
@@ -1,7 +1,7 @@
 Static files dir
 ================

-Files you put in /static_files/ will be copied to the web visible /_static/
+Files you put in /sources/static_files/ will be copied to the web visible /_static/

 Be careful not to override pre-existing static files from the template.

@@ -1,20 +0,0 @@
-#!/bin/bash -e
-
-
-# Sed to process GitHub Markdown
-# 1-2 Remove comment code from metadata block
-# 
-for i in ls -l /docs/content/*
-  do                 # Line breaks are important
-    if [ -d $i ]   # Spaces are important
-      then
-        y=${i##*/}
-        find $i -type f -name "*.md" -exec sed -i.old \
-        -e '/^<!.*metadata]>/g' \
-        -e '/^<!.*end-metadata.*>/g' {} \;
-    fi
-done
-
-
-
-
@@ -15,9 +15,7 @@ parent = "smn_applied"
 Docker allows you to run applications inside containers. Running an
 application inside a container takes a single command: `docker run`.

-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}

 ## Hello world

@@ -1,5 +1,6 @@
 <!--[metadata]>
 +++
+draft = true
 title = "The Docker user guide"
 description = "The Docker user guide home page"
 keywords = ["docker, introduction, documentation, about, technology, docker.io, user, guide, user's, manual, platform, framework, virtualization, home,  intro"]
@@ -1,8 +1,11 @@
 <!--[metadata]>
 +++
+draft = true
 title = "Docker images test"
 description = "How to work with Docker images."
 keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub,  collaboration"]
+[menu.main]
+parent = "identifier"
 +++
 <![end-metadata]-->

@@ -1,8 +1,11 @@
 <!--[metadata]>
 +++
+draft = true
 title = "Docker images test"
 description = "How to work with Docker images."
 keywords = ["documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub,  collaboration"]
+[menu.main]
+parent = "identifier"
 +++
 <![end-metadata]-->

@@ -5,9 +5,9 @@ Docker Engine.

 This page is intended for people who want to develop their own Docker plugin.
 If you just want to learn about or use Docker plugins, look
-[here](/experimental/plugins.md).
+[here](/userguide/plugins).

-This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](README.md).
+This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](experimental.md).

 ## What plugins are

@@ -3,12 +3,12 @@
 You can extend the capabilities of the Docker Engine by loading third-party
 plugins. 

-This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](README.md).
+This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](experimental.md).

 ## Types of plugins

 Plugins extend Docker's functionality.  They come in specific types.  For
-example, a [volume plugin](/experimental/plugins_volume.md) might enable Docker
+example, a [volume plugin](/experimental/plugins_volume) might enable Docker
 volumes to persist across multiple Docker hosts.

 Currently Docker supports volume plugins. In the future it will support
@@ -35,7 +35,7 @@ of the plugin for help. The Docker team may not be able to assist you.
 ## Writing a plugin

 If you are interested in writing a plugin for Docker, or seeing how they work
-under the hood, see the [docker plugins reference](/experimental/plugin_api.md).
+under the hood, see the [docker plugins reference](/experimental/plugin_api).

 # Related GitHub PRs and issues

@@ -2,10 +2,10 @@

 Docker volume plugins enable Docker deployments to be integrated with external
 storage systems, such as Amazon EBS, and enable data volumes to persist beyond
-the lifetime of a single Docker host. See the [plugin documentation](/experimental/plugins.md)
+the lifetime of a single Docker host. See the [plugin documentation](/experimental/plugins)
 for more information.

-This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](README.md).
+This is an experimental feature. For information on installing and using experimental features, see [the experimental feature overview](experimental.md).

 # Command-line changes

@@ -29,10 +29,9 @@ import (

 // A Graph is a store for versioned filesystem images and the relationship between them.
 type Graph struct {
-	Root       string
-	idIndex    *truncindex.TruncIndex
-	driver     graphdriver.Driver
-	imageMutex imageMutex // protect images in driver.
+	Root    string
+	idIndex *truncindex.TruncIndex
+	driver  graphdriver.Driver
 }

 // NewGraph instantiates a new graph at the given root path in the filesystem.
@@ -146,15 +145,6 @@ func (graph *Graph) Create(layerData archive.ArchiveReader, containerID, contain

 // Register imports a pre-existing image into the graph.
 func (graph *Graph) Register(img *image.Image, layerData archive.ArchiveReader) (err error) {
-	if err := image.ValidateID(img.ID); err != nil {
-		return err
-	}
-
-	// We need this entire operation to be atomic within the engine. Note that
-	// this doesn't mean Register is fully safe yet.
-	graph.imageMutex.Lock(img.ID)
-	defer graph.imageMutex.Unlock(img.ID)
-
 	defer func() {
 		// If any error occurs, remove the new dir from the driver.
 		// Don't check for errors since the dir might not have been created.
@@ -163,7 +153,9 @@ func (graph *Graph) Register(img *image.Image, layerData archive.ArchiveReader)
 			graph.driver.Remove(img.ID)
 		}
 	}()
-
+	if err := image.ValidateID(img.ID); err != nil {
+		return err
+	}
 	// (This is a convenience to save time. Race conditions are taken care of by os.Rename)
 	if graph.Exists(img.ID) {
 		return fmt.Errorf("Image %s already exists", img.ID)
@@ -1,45 +0,0 @@
-package graph
-
-import "sync"
-
-// imageMutex provides a lock per image id to protect shared resources in the
-// graph. This is only used with registration but should be used when
-// manipulating the layer store.
-type imageMutex struct {
-	mus map[string]*sync.Mutex // mutexes by image id.
-	mu  sync.Mutex             // protects lock map
-
-	// NOTE(stevvooe): The map above will grow to the size of all images ever
-	// registered during a daemon run. To free these resources, we must
-	// deallocate after unlock. Doing this safely is non-trivial in the face
-	// of a very minor leak.
-}
-
-// Lock the provided id.
-func (im *imageMutex) Lock(id string) {
-	im.getImageLock(id).Lock()
-}
-
-// Unlock the provided id.
-func (im *imageMutex) Unlock(id string) {
-	im.getImageLock(id).Unlock()
-}
-
-// getImageLock returns the mutex for the given id. This method will never
-// return nil.
-func (im *imageMutex) getImageLock(id string) *sync.Mutex {
-	im.mu.Lock()
-	defer im.mu.Unlock()
-
-	if im.mus == nil { // lazy
-		im.mus = make(map[string]*sync.Mutex)
-	}
-
-	mu, ok := im.mus[id]
-	if !ok {
-		mu = new(sync.Mutex)
-		im.mus[id] = mu
-	}
-
-	return mu
-}
@@ -207,8 +207,6 @@ do_install() {
 					$sh_c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9"
 				elif [ "https://test.docker.com/" = "$url" ]; then
 					$sh_c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6"
-				elif [ "https://experimental.docker.com/" = "$url" ]; then
-					$sh_c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E33FF7BF5C91D50A6F91FFFD4CC38D40F9A96B49"
 				else
 					$sh_c "$curl ${url}gpg | apt-key add -"
 				fi
@@ -284,8 +284,6 @@ EOF
 	local gpgFingerprint=36A1D7869245C8950F966E92D8576A8BA88D21E9
 	if [[ $BUCKET == test* ]]; then
 		gpgFingerprint=740B314AE3941731B942C66ADF4FD13717AAD7D6
-	elif [[ $BUCKET == experimental* ]]; then
-		gpgFingerprint=E33FF7BF5C91D50A6F91FFFD4CC38D40F9A96B49
 	fi

 	# Upload repo
@@ -55,9 +55,9 @@ clone hg code.google.com/p/go.net 84a4013f96e0
 clone hg code.google.com/p/gosqlite 74691fb6f837

 #get libnetwork packages
-clone git github.com/docker/libnetwork 3daf67270570c1e07e3e3184d46a10f0c5d66f87
-clone git github.com/vishvananda/netns 493029407eeb434d0c2d44e02ea072ff2488d322
-clone git github.com/vishvananda/netlink 20397a138846e4d6590e01783ed023ed7e1c38a6
+clone git github.com/docker/libnetwork e578e95aa101441481411ff1d620f343895f24fe
+clone git github.com/vishvananda/netns 5478c060110032f972e86a1f844fdb9a2f008f2c
+clone git github.com/vishvananda/netlink 8eb64238879fed52fd51c5b30ad20b928fb4c36c

 # get distribution packages
 clone git github.com/docker/distribution b9eeb328080d367dbde850ec6e94f1e4ac2b5efe
@@ -2,7 +2,6 @@ package main

 import (
 	"bytes"
-	"net/http"
 	"os/exec"
 	"strings"
 	"time"
@@ -78,24 +77,3 @@ func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {
 		c.Fatal("Expected output on websocket to match input")
 	}
 }
-
-// regression gh14320
-func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) {
-	status, body, err := sockRequest("POST", "/containers/doesnotexist/attach", nil)
-	c.Assert(status, check.Equals, http.StatusNotFound)
-	c.Assert(err, check.IsNil)
-	expected := "no such id: doesnotexist\n"
-	if !strings.Contains(string(body), expected) {
-		c.Fatalf("Expected response body to contain %q", expected)
-	}
-}
-
-func (s *DockerSuite) TestGetContainersWsAttachContainerNotFound(c *check.C) {
-	status, body, err := sockRequest("GET", "/containers/doesnotexist/attach/ws", nil)
-	c.Assert(status, check.Equals, http.StatusNotFound)
-	c.Assert(err, check.IsNil)
-	expected := "no such id: doesnotexist\n"
-	if !strings.Contains(string(body), expected) {
-		c.Fatalf("Expected response body to contain %q", expected)
-	}
-}
@@ -998,30 +998,6 @@ func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {
 	body.Close()
 }

-//Issue 14230. daemon should return 500 for invalid port syntax
-func (s *DockerSuite) TestContainerApiInvalidPortSyntax(c *check.C) {
-	config := `{
-				  "Image": "busybox",
-				  "HostConfig": {
-					"PortBindings": {
-					  "19039;1230": [
-						{}
-					  ]
-					}
-				  }
-				}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(res.StatusCode, check.Equals, http.StatusInternalServerError)
-	c.Assert(err, check.IsNil)
-
-	b, err := readBody(body)
-	if err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(strings.Contains(string(b[:]), "Invalid port"), check.Equals, true)
-}
-
 // Issue 7941 - test to make sure a "null" in JSON is just ignored.
 // W/o this fix a null in JSON would be parsed into a string var as "null"
 func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) {
@@ -1525,48 +1501,3 @@ func (s *DockerSuite) TestPostContainerStop(c *check.C) {
 		c.Fatal(err)
 	}
 }
-
-// #14170
-func (s *DockerSuite) TestPostContainersCreateWithStringOrSliceEntrypoint(c *check.C) {
-	config := struct {
-		Image      string
-		Entrypoint string
-		Cmd        []string
-	}{"busybox", "echo", []string{"hello", "world"}}
-	_, _, err := sockRequest("POST", "/containers/create?name=echotest", config)
-	c.Assert(err, check.IsNil)
-	out, _ := dockerCmd(c, "start", "-a", "echotest")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello world")
-
-	config2 := struct {
-		Image      string
-		Entrypoint []string
-		Cmd        []string
-	}{"busybox", []string{"echo"}, []string{"hello", "world"}}
-	_, _, err = sockRequest("POST", "/containers/create?name=echotest2", config2)
-	c.Assert(err, check.IsNil)
-	out, _ = dockerCmd(c, "start", "-a", "echotest2")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello world")
-}
-
-// #14170
-func (s *DockerSuite) TestPostContainersCreateWithStringOrSliceCmd(c *check.C) {
-	config := struct {
-		Image      string
-		Entrypoint string
-		Cmd        string
-	}{"busybox", "echo", "hello world"}
-	_, _, err := sockRequest("POST", "/containers/create?name=echotest", config)
-	c.Assert(err, check.IsNil)
-	out, _ := dockerCmd(c, "start", "-a", "echotest")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello world")
-
-	config2 := struct {
-		Image string
-		Cmd   []string
-	}{"busybox", []string{"echo", "hello", "world"}}
-	_, _, err = sockRequest("POST", "/containers/create?name=echotest2", config2)
-	c.Assert(err, check.IsNil)
-	out, _ = dockerCmd(c, "start", "-a", "echotest2")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello world")
-}
@@ -3,8 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"os/exec"
-	"strconv"
 	"strings"

 	"github.com/docker/docker/api/types"
@@ -35,41 +33,3 @@ func (s *DockerSuite) TestCliStatsNoStreamGetCpu(c *check.C) {
 		c.Fatalf("docker stats with no-stream get cpu usage failed: was %v", cpuPercent)
 	}
 }
-
-func (s *DockerSuite) TestApiNetworkStats(c *check.C) {
-	// Run container for 30 secs
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	err := waitRun(id)
-	c.Assert(err, check.IsNil)
-
-	// Retrieve the container address
-	contIP := findContainerIP(c, id)
-	numPings := 10
-
-	// Get the container networking stats before and after pinging the container
-	nwStatsPre := getNetworkStats(c, id)
-	_, err = exec.Command("ping", contIP, "-c", strconv.Itoa(numPings)).Output()
-	c.Assert(err, check.IsNil)
-	nwStatsPost := getNetworkStats(c, id)
-
-	// Verify the stats contain at least the expected number of packets (account for ARP)
-	expRxPkts := 1 + nwStatsPre.RxPackets + uint64(numPings)
-	expTxPkts := 1 + nwStatsPre.TxPackets + uint64(numPings)
-	c.Assert(nwStatsPost.TxPackets >= expTxPkts, check.Equals, true,
-		check.Commentf("Reported less TxPackets than expected. Expected >= %d. Found %d", expTxPkts, nwStatsPost.TxPackets))
-	c.Assert(nwStatsPost.RxPackets >= expRxPkts, check.Equals, true,
-		check.Commentf("Reported less Txbytes than expected. Expected >= %d. Found %d", expRxPkts, nwStatsPost.RxPackets))
-}
-
-func getNetworkStats(c *check.C, id string) types.Network {
-	var st *types.Stats
-
-	_, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", id), nil, "")
-	c.Assert(err, check.IsNil)
-
-	err = json.NewDecoder(body).Decode(&st)
-	c.Assert(err, check.IsNil)
-
-	return st.Network
-}
@@ -3,18 +3,15 @@ package main
 import (
 	"net/http"
 	"net/http/httputil"
-	"strconv"
-	"strings"
 	"time"

-	"github.com/docker/docker/api"
 	"github.com/go-check/check"
 )

 func (s *DockerSuite) TestApiOptionsRoute(c *check.C) {
 	status, _, err := sockRequest("OPTIONS", "/", nil)
-	c.Assert(err, check.IsNil)
 	c.Assert(status, check.Equals, http.StatusOK)
+	c.Assert(err, check.IsNil)
 }

 func (s *DockerSuite) TestApiGetEnabledCors(c *check.C) {
@@ -29,7 +26,7 @@ func (s *DockerSuite) TestApiGetEnabledCors(c *check.C) {
 	//c.Assert(res.Header.Get("Access-Control-Allow-Headers"), check.Equals, "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")
 }

-func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) {
+func (s *DockerSuite) TestVersionStatusCode(c *check.C) {
 	conn, err := sockConn(time.Duration(10 * time.Second))
 	c.Assert(err, check.IsNil)

@@ -43,31 +40,3 @@ func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) {
 	res, err := client.Do(req)
 	c.Assert(res.StatusCode, check.Equals, http.StatusBadRequest)
 }
-
-func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) {
-	v := strings.Split(string(api.Version), ".")
-	vMinInt, err := strconv.Atoi(v[1])
-	c.Assert(err, check.IsNil)
-	vMinInt++
-	v[1] = strconv.Itoa(vMinInt)
-	version := strings.Join(v, ".")
-
-	status, body, err := sockRequest("GET", "/v"+version+"/version", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusBadRequest)
-	c.Assert(len(string(body)), check.Not(check.Equals), 0) // Expected not empty body
-}
-
-func (s *DockerSuite) TestApiClientVersionOldNotSupported(c *check.C) {
-	v := strings.Split(string(api.MinVersion), ".")
-	vMinInt, err := strconv.Atoi(v[1])
-	c.Assert(err, check.IsNil)
-	vMinInt--
-	v[1] = strconv.Itoa(vMinInt)
-	version := strings.Join(v, ".")
-
-	status, body, err := sockRequest("GET", "/v"+version+"/version", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusBadRequest)
-	c.Assert(len(string(body)), check.Not(check.Equals), 0) // Expected not empty body
-}
@@ -632,20 +632,3 @@ func (s *DockerSuite) TestCopyAndRestart(c *check.C) {
 		c.Fatalf("expected %q but got %q", expectedMsg, msg)
 	}
 }
-
-func (s *DockerSuite) TestCopyCreatedContainer(c *check.C) {
-	out, err := exec.Command(dockerBinary, "create", "--name", "test_cp", "-v", "/test", "busybox").CombinedOutput()
-	if err != nil {
-		c.Fatalf(string(out), err)
-	}
-
-	tmpDir, err := ioutil.TempDir("", "test")
-	if err != nil {
-		c.Fatalf("unable to make temporary directory: %s", err)
-	}
-	defer os.RemoveAll(tmpDir)
-	out, err = exec.Command(dockerBinary, "cp", "test_cp:/bin/sh", tmpDir).CombinedOutput()
-	if err != nil {
-		c.Fatalf(string(out), err)
-	}
-}
@@ -1207,12 +1207,7 @@ func (s *DockerDaemonSuite) TestRunContainerWithBridgeNone(c *check.C) {
 	out, err := s.d.Cmd("run", "--rm", "busybox", "ip", "l")
 	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
 	c.Assert(strings.Contains(out, "eth0"), check.Equals, false,
-		check.Commentf("There shouldn't be eth0 in container in default(bridge) mode when bridge network is disabled: %s", out))
-
-	out, err = s.d.Cmd("run", "--rm", "--net=host", "busybox", "ip", "l")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(strings.Contains(out, "eth0"), check.Equals, true,
-		check.Commentf("There should be eth0 in container when --net=host when bridge network is disabled: %s", out))
+		check.Commentf("There shouldn't be eth0 in container when network is disabled: %s", out))
 }

 func (s *DockerDaemonSuite) TestDaemonRestartWithContainerRunning(t *check.C) {
@@ -444,6 +444,7 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
 }

 func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) {
+
 	var out string
 	out, _ = dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
 	idA := strings.TrimSpace(out)
@@ -608,6 +609,7 @@ func (s *DockerSuite) TestRunMutableNetworkFiles(c *check.C) {
 }

 func (s *DockerSuite) TestExecWithUser(c *check.C) {
+
 	runCmd := exec.Command(dockerBinary, "run", "-d", "--name", "parent", "busybox", "top")
 	if out, _, err := runCommandWithOutput(runCmd); err != nil {
 		c.Fatal(out, err)
@@ -632,22 +634,3 @@ func (s *DockerSuite) TestExecWithUser(c *check.C) {
 	}

 }
-
-func (s *DockerSuite) TestExecWithImageUser(c *check.C) {
-	name := "testbuilduser"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-		USER dockerio`,
-		true)
-	if err != nil {
-		c.Fatalf("Could not build image %s: %v", name, err)
-	}
-
-	dockerCmd(c, "run", "-d", "--name", "dockerioexec", name, "top")
-
-	out, _ := dockerCmd(c, "exec", "dockerioexec", "whoami")
-	if !strings.Contains(out, "dockerio") {
-		c.Fatalf("exec with user by id expected dockerio user got %s", out)
-	}
-}
--- a/Show More
+++ b/Show More