1
0
mirror of https://github.com/moby/moby.git synced 2025-08-08 13:22:22 +03:00

update go import path and libcontainer

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Victor Vieux
2014-07-24 22:19:50 +00:00
parent 2481e08e41
commit b3ee9ac74e
200 changed files with 828 additions and 515 deletions

View File

@@ -193,7 +193,7 @@ Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Jean-Baptiste Dalido <jeanbaptiste@appgratis.com> Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
Jeff Lindsay <progrium@gmail.com> Jeff Lindsay <progrium@gmail.com>
Jeremy Grosser <jeremy@synack.me> Jeremy Grosser <jeremy@synack.me>
Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> Jérôme Petazzoni <jerome.petazzoni@docker.com>
Jesse Dubay <jesse@thefortytwo.net> Jesse Dubay <jesse@thefortytwo.net>
Jilles Oldenbeuving <ojilles@gmail.com> Jilles Oldenbeuving <ojilles@gmail.com>
Jim Alateras <jima@comware.com.au> Jim Alateras <jima@comware.com.au>
@@ -418,7 +418,7 @@ Tzu-Jung Lee <roylee17@gmail.com>
Ulysse Carion <ulyssecarion@gmail.com> Ulysse Carion <ulyssecarion@gmail.com>
unclejack <unclejacksons@gmail.com> unclejack <unclejacksons@gmail.com>
vgeta <gopikannan.venugopalsamy@gmail.com> vgeta <gopikannan.venugopalsamy@gmail.com>
Victor Coisne <victor.coisne@dotcloud.com> Victor Coisne <victor.coisne@docker.com>
Victor Lyuboslavsky <victor@victoreda.com> Victor Lyuboslavsky <victor@victoreda.com>
Victor Marmol <vmarmol@google.com> Victor Marmol <vmarmol@google.com>
Victor Vieux <victor.vieux@docker.com> Victor Vieux <victor.vieux@docker.com>

View File

@@ -6,7 +6,7 @@ feels wrong or incomplete.
## Reporting Issues ## Reporting Issues
When reporting [issues](https://github.com/dotcloud/docker/issues) on When reporting [issues](https://github.com/docker/docker/issues) on
GitHub please include your host OS (Ubuntu 12.04, Fedora 19, etc). GitHub please include your host OS (Ubuntu 12.04, Fedora 19, etc).
Please include: Please include:
@@ -53,7 +53,7 @@ else is working on the same thing.
### Create issues... ### Create issues...
Any significant improvement should be documented as [a GitHub Any significant improvement should be documented as [a GitHub
issue](https://github.com/dotcloud/docker/issues) before anybody issue](https://github.com/docker/docker/issues) before anybody
starts working on it. starts working on it.
### ...but check for existing issues first! ### ...but check for existing issues first!
@@ -180,7 +180,7 @@ One way to automate this, is customize your git `commit.template` by adding
a `prepare-commit-msg` hook to your Docker repository: a `prepare-commit-msg` hook to your Docker repository:
``` ```
curl -sSL -o .git/hooks/prepare-commit-msg https://raw.githubusercontent.com/dotcloud/docker/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg curl -sSL -o .git/hooks/prepare-commit-msg https://raw.githubusercontent.com/docker/docker/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
``` ```
* Note: the above script expects to find your GitHub user name in `git config --get github.user` * Note: the above script expects to find your GitHub user name in `git config --get github.user`

View File

@@ -6,7 +6,7 @@
# docker build -t docker . # docker build -t docker .
# #
# # Mount your source in an interactive container for quick testing: # # Mount your source in an interactive container for quick testing:
# docker run -v `pwd`:/go/src/github.com/dotcloud/docker --privileged -i -t docker bash # docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
# #
# # Run the test suite: # # Run the test suite:
# docker run --privileged docker hack/make.sh test # docker run --privileged docker hack/make.sh test
@@ -62,7 +62,7 @@ RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper
# Install Go # Install Go
RUN curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz RUN curl -sSL https://go.googlecode.com/files/go1.2.1.src.tar.gz | tar -v -C /usr/local -xz
ENV PATH /usr/local/go/bin:$PATH ENV PATH /usr/local/go/bin:$PATH
ENV GOPATH /go:/go/src/github.com/dotcloud/docker/vendor ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1 RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
# Compile Go for cross compilation # Compile Go for cross compilation
@@ -94,11 +94,11 @@ RUN groupadd -r docker
RUN useradd --create-home --gid docker unprivilegeduser RUN useradd --create-home --gid docker unprivilegeduser
VOLUME /var/lib/docker VOLUME /var/lib/docker
WORKDIR /go/src/github.com/dotcloud/docker WORKDIR /go/src/github.com/docker/docker
ENV DOCKER_BUILDTAGS apparmor selinux ENV DOCKER_BUILDTAGS apparmor selinux
# Wrap all commands in the "docker-in-docker" script to allow nested containers # Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"] ENTRYPOINT ["hack/dind"]
# Upload docker source # Upload docker source
COPY . /go/src/github.com/dotcloud/docker COPY . /go/src/github.com/docker/docker

View File

@@ -10,7 +10,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH)) DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH)) DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)") DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/docker/docker/$(BINDDIR)")
DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e TESTDIRS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)" DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e TESTDIRS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)"
# to allow `make DOCSDIR=docs docs-shell` # to allow `make DOCSDIR=docs docs-shell`

View File

@@ -10,9 +10,9 @@ import (
"strings" "strings"
"text/template" "text/template"
flag "github.com/dotcloud/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/dotcloud/docker/registry" "github.com/docker/docker/registry"
) )
var funcMap = template.FuncMap{ var funcMap = template.FuncMap{

View File

@@ -22,19 +22,19 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/nat" "github.com/docker/docker/nat"
"github.com/dotcloud/docker/opts" "github.com/docker/docker/opts"
"github.com/dotcloud/docker/pkg/signal" "github.com/docker/docker/pkg/signal"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/dotcloud/docker/pkg/units" "github.com/docker/docker/pkg/units"
"github.com/dotcloud/docker/registry" "github.com/docker/docker/registry"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/dotcloud/docker/utils/filters" "github.com/docker/docker/utils/filters"
) )
const ( const (

View File

@@ -11,10 +11,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func (cli *DockerCli) dial() (net.Conn, error) { func (cli *DockerCli) dial() (net.Conn, error) {

View File

@@ -17,12 +17,12 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/dotcloud/docker/registry" "github.com/docker/docker/registry"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
var ( var (

View File

@@ -5,9 +5,9 @@ import (
"mime" "mime"
"strings" "strings"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/pkg/version" "github.com/docker/docker/pkg/version"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
const ( const (

View File

@@ -22,14 +22,14 @@ import (
"code.google.com/p/go.net/websocket" "code.google.com/p/go.net/websocket"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/pkg/listenbuffer" "github.com/docker/docker/pkg/listenbuffer"
"github.com/dotcloud/docker/pkg/systemd" "github.com/docker/docker/pkg/systemd"
"github.com/dotcloud/docker/pkg/user" "github.com/docker/docker/pkg/user"
"github.com/dotcloud/docker/pkg/version" "github.com/docker/docker/pkg/version"
"github.com/dotcloud/docker/registry" "github.com/docker/docker/registry"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

View File

@@ -11,9 +11,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/pkg/version" "github.com/docker/docker/pkg/version"
) )
func TestGetBoolParam(t *testing.T) { func TestGetBoolParam(t *testing.T) {

View File

@@ -16,9 +16,9 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/dotcloud/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
type ( type (

View File

@@ -11,7 +11,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
func TestCmdStreamLargeStderr(t *testing.T) { func TestCmdStreamLargeStderr(t *testing.T) {

View File

@@ -11,9 +11,9 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/dotcloud/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
type ChangeType int type ChangeType int

View File

@@ -10,7 +10,7 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
) )
// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes. // Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.

View File

@@ -2,7 +2,7 @@ package archive
import ( import (
"bytes" "bytes"
"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
"io/ioutil" "io/ioutil"
) )

View File

@@ -3,14 +3,14 @@ package builtins
import ( import (
"runtime" "runtime"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
apiserver "github.com/dotcloud/docker/api/server" apiserver "github.com/docker/docker/api/server"
"github.com/dotcloud/docker/daemon/networkdriver/bridge" "github.com/docker/docker/daemon/networkdriver/bridge"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/registry" "github.com/docker/docker/registry"
"github.com/dotcloud/docker/server" "github.com/docker/docker/server"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func Register(eng *engine.Engine) error { func Register(eng *engine.Engine) error {

View File

@@ -3,7 +3,7 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/dotcloud/docker/daemon/graphdriver/devmapper" "github.com/docker/docker/daemon/graphdriver/devmapper"
"os" "os"
"path" "path"
"sort" "sort"

View File

@@ -19,7 +19,7 @@ ENV GOROOT /goroot
ENV GOPATH /go ENV GOPATH /go
ENV PATH $GOROOT/bin:$PATH ENV PATH $GOROOT/bin:$PATH
RUN go get github.com/dotcloud/docker && cd /go/src/github.com/dotcloud/docker && git checkout v0.6.3 RUN go get github.com/docker/docker && cd /go/src/github.com/docker/docker && git checkout v0.6.3
ADD manager.go /manager/ ADD manager.go /manager/
RUN cd /manager && go build -o /usr/bin/manager RUN cd /manager && go build -o /usr/bin/manager

View File

@@ -5,7 +5,7 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"github.com/dotcloud/docker" "github.com/docker/docker"
"os" "os"
"strings" "strings"
"text/template" "text/template"

View File

@@ -37,7 +37,7 @@ if [ ! -e "manager/$script" ]; then
exit 1 exit 1
fi fi
# TODO https://github.com/dotcloud/docker/issues/734 (docker inspect formatting) # TODO https://github.com/docker/docker/issues/734 (docker inspect formatting)
#if command -v docker > /dev/null 2>&1; then #if command -v docker > /dev/null 2>&1; then
# image="$(docker inspect -f '{{.Image}}' "$cid")" # image="$(docker inspect -f '{{.Image}}' "$cid")"
# if [ "$image" ]; then # if [ "$image" ]; then

View File

@@ -50,7 +50,7 @@ start() {
pid=$! pid=$!
touch $lockfile touch $lockfile
# wait up to 10 seconds for the pidfile to exist. see # wait up to 10 seconds for the pidfile to exist. see
# https://github.com/dotcloud/docker/issues/5359 # https://github.com/docker/docker/issues/5359
tries=0 tries=0
while [ ! -f $pidfile -a $tries -lt 10 ]; do while [ ! -f $pidfile -a $tries -lt 10 ]; do
sleep 1 sleep 1

View File

@@ -144,7 +144,7 @@ if [ -z "$strictDebootstrap" ]; then
# initctl (for some pesky upstart scripts) # initctl (for some pesky upstart scripts)
sudo chroot . dpkg-divert --local --rename --add /sbin/initctl sudo chroot . dpkg-divert --local --rename --add /sbin/initctl
sudo ln -sf /bin/true sbin/initctl sudo ln -sf /bin/true sbin/initctl
# see https://github.com/dotcloud/docker/issues/446#issuecomment-16953173 # see https://github.com/docker/docker/issues/446#issuecomment-16953173
# shrink the image, since apt makes us fat (wheezy: ~157.5MB vs ~120MB) # shrink the image, since apt makes us fat (wheezy: ~157.5MB vs ~120MB)
sudo chroot . apt-get clean sudo chroot . apt-get clean

View File

@@ -83,7 +83,7 @@ if [ -d "$rootfsDir/etc/apt/apt.conf.d" ]; then
Dir::Cache::srcpkgcache ""; Dir::Cache::srcpkgcache "";
# Note that we do realize this isn't the ideal way to do this, and are always # Note that we do realize this isn't the ideal way to do this, and are always
# open to better suggestions (https://github.com/dotcloud/docker/issues). # open to better suggestions (https://github.com/docker/docker/issues).
EOF EOF
# remove apt-cache translations for fast "apt-get update" # remove apt-cache translations for fast "apt-get update"

View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Auto sign all commits to allow them to be used by the Docker project. # Auto sign all commits to allow them to be used by the Docker project.
# see https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md#sign-your-work # see https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
# #
GH_USER=$(git config --get github.user) GH_USER=$(git config --get github.user)
SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p") SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p")

View File

@@ -3,7 +3,7 @@ package daemon
import ( import (
"io" "io"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinCloser io.Closer, stdout io.Writer, stderr io.Writer) chan error { func (daemon *Daemon) Attach(container *Container, stdin io.ReadCloser, stdinCloser io.Closer, stdout io.Writer, stderr io.Writer) chan error {

View File

@@ -17,19 +17,19 @@ import (
"github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/devices"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/image" "github.com/docker/docker/image"
"github.com/dotcloud/docker/links" "github.com/docker/docker/links"
"github.com/dotcloud/docker/nat" "github.com/docker/docker/nat"
"github.com/dotcloud/docker/pkg/networkfs/etchosts" "github.com/docker/docker/pkg/networkfs/etchosts"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/pkg/symlink" "github.com/docker/docker/pkg/symlink"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/dotcloud/docker/utils/broadcastwriter" "github.com/docker/docker/utils/broadcastwriter"
) )
const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

View File

@@ -1,7 +1,7 @@
package daemon package daemon
import ( import (
"github.com/dotcloud/docker/nat" "github.com/docker/docker/nat"
"testing" "testing"
) )

View File

@@ -13,27 +13,27 @@ import (
"time" "time"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/execdrivers" "github.com/docker/docker/daemon/execdriver/execdrivers"
"github.com/dotcloud/docker/daemon/execdriver/lxc" "github.com/docker/docker/daemon/execdriver/lxc"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
_ "github.com/dotcloud/docker/daemon/graphdriver/vfs" _ "github.com/docker/docker/daemon/graphdriver/vfs"
_ "github.com/dotcloud/docker/daemon/networkdriver/bridge" _ "github.com/docker/docker/daemon/networkdriver/bridge"
"github.com/dotcloud/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/dotcloud/docker/daemonconfig" "github.com/docker/docker/daemonconfig"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/graph" "github.com/docker/docker/graph"
"github.com/dotcloud/docker/image" "github.com/docker/docker/image"
"github.com/dotcloud/docker/pkg/graphdb" "github.com/docker/docker/pkg/graphdb"
"github.com/dotcloud/docker/pkg/namesgenerator" "github.com/docker/docker/pkg/namesgenerator"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/pkg/sysinfo" "github.com/docker/docker/pkg/sysinfo"
"github.com/dotcloud/docker/pkg/truncindex" "github.com/docker/docker/pkg/truncindex"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/dotcloud/docker/utils/broadcastwriter" "github.com/docker/docker/utils/broadcastwriter"
) )
// Set the max depth to the aufs default that most // Set the max depth to the aufs default that most

View File

@@ -3,10 +3,10 @@
package daemon package daemon
import ( import (
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/dotcloud/docker/daemon/graphdriver/aufs" "github.com/docker/docker/daemon/graphdriver/aufs"
"github.com/dotcloud/docker/graph" "github.com/docker/docker/graph"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
// Given the graphdriver ad, if it is aufs, then migrate it. // Given the graphdriver ad, if it is aufs, then migrate it.

View File

@@ -3,5 +3,5 @@
package daemon package daemon
import ( import (
_ "github.com/dotcloud/docker/daemon/graphdriver/btrfs" _ "github.com/docker/docker/daemon/graphdriver/btrfs"
) )

View File

@@ -3,5 +3,5 @@
package daemon package daemon
import ( import (
_ "github.com/dotcloud/docker/daemon/graphdriver/devmapper" _ "github.com/docker/docker/daemon/graphdriver/devmapper"
) )

View File

@@ -3,7 +3,7 @@
package daemon package daemon
import ( import (
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
) )
func migrateIfAufs(driver graphdriver.Driver, root string) error { func migrateIfAufs(driver graphdriver.Driver, root string) error {

View File

@@ -2,10 +2,10 @@ package execdrivers
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/lxc" "github.com/docker/docker/daemon/execdriver/lxc"
"github.com/dotcloud/docker/daemon/execdriver/native" "github.com/docker/docker/daemon/execdriver/native"
"github.com/dotcloud/docker/pkg/sysinfo" "github.com/docker/docker/pkg/sysinfo"
"path" "path"
) )

View File

@@ -19,9 +19,9 @@ import (
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/docker/libcontainer/mount/nodes" "github.com/docker/libcontainer/mount/nodes"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"github.com/kr/pty" "github.com/kr/pty"
) )

View File

@@ -10,7 +10,7 @@ import (
"syscall" "syscall"
"github.com/docker/libcontainer/netlink" "github.com/docker/libcontainer/netlink"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
) )
// Clear environment pollution introduced by lxc-start // Clear environment pollution introduced by lxc-start

View File

@@ -10,9 +10,9 @@ import (
"github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/security/capabilities" "github.com/docker/libcontainer/security/capabilities"
"github.com/docker/libcontainer/utils" "github.com/docker/libcontainer/utils"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/native/template" "github.com/docker/docker/daemon/execdriver/native/template"
"github.com/dotcloud/docker/pkg/system" "github.com/docker/docker/pkg/system"
) )
func setHostname(hostname string) error { func setHostname(hostname string) error {

View File

@@ -2,7 +2,7 @@
package lxc package lxc
import "github.com/dotcloud/docker/daemon/execdriver" import "github.com/docker/docker/daemon/execdriver"
func setHostname(hostname string) error { func setHostname(hostname string) error {
panic("Not supported on darwin") panic("Not supported on darwin")

View File

@@ -5,7 +5,7 @@ import (
"text/template" "text/template"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
) )
const LxcTemplate = ` const LxcTemplate = `

View File

@@ -14,7 +14,7 @@ import (
"time" "time"
"github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/devices"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
) )
func TestLXCConfig(t *testing.T) { func TestLXCConfig(t *testing.T) {

View File

@@ -8,7 +8,7 @@ import (
"strings" "strings"
"github.com/docker/libcontainer" "github.com/docker/libcontainer"
"github.com/dotcloud/docker/pkg/units" "github.com/docker/docker/pkg/units"
) )
type Action func(*libcontainer.Config, interface{}, string) error type Action func(*libcontainer.Config, interface{}, string) error

View File

@@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/docker/libcontainer/security/capabilities" "github.com/docker/libcontainer/security/capabilities"
"github.com/dotcloud/docker/daemon/execdriver/native/template" "github.com/docker/docker/daemon/execdriver/native/template"
) )
// Checks whether the expected capability is specified in the capabilities. // Checks whether the expected capability is specified in the capabilities.

View File

@@ -13,9 +13,9 @@ import (
"github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/devices"
"github.com/docker/libcontainer/mount" "github.com/docker/libcontainer/mount"
"github.com/docker/libcontainer/security/capabilities" "github.com/docker/libcontainer/security/capabilities"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/native/configuration" "github.com/docker/docker/daemon/execdriver/native/configuration"
"github.com/dotcloud/docker/daemon/execdriver/native/template" "github.com/docker/docker/daemon/execdriver/native/template"
) )
// createContainer populates and configures the container type with the // createContainer populates and configures the container type with the

View File

@@ -20,9 +20,9 @@ import (
"github.com/docker/libcontainer/cgroups/systemd" "github.com/docker/libcontainer/cgroups/systemd"
"github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/syncpipe" "github.com/docker/libcontainer/syncpipe"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/dotcloud/docker/pkg/term" "github.com/docker/docker/pkg/term"
) )
const ( const (

View File

@@ -5,7 +5,7 @@ package native
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
) )
func NewDriver(root, initPath string) (execdriver.Driver, error) { func NewDriver(root, initPath string) (execdriver.Driver, error) {

View File

@@ -5,7 +5,7 @@ package native
import ( import (
"fmt" "fmt"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
) )
func NewDriver(root, initPath string) (execdriver.Driver, error) { func NewDriver(root, initPath string) (execdriver.Driver, error) {

View File

@@ -5,7 +5,7 @@ import (
"strings" "strings"
"github.com/docker/libcontainer/security/capabilities" "github.com/docker/libcontainer/security/capabilities"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func TweakCapabilities(basics, adds, drops []string) ([]string, error) { func TweakCapabilities(basics, adds, drops []string) ([]string, error) {

View File

@@ -31,10 +31,10 @@ import (
"syscall" "syscall"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
mountpk "github.com/dotcloud/docker/pkg/mount" mountpk "github.com/docker/docker/pkg/mount"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
var ( var (

View File

@@ -4,8 +4,8 @@ import (
"crypto/sha256" "crypto/sha256"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"io/ioutil" "io/ioutil"
"os" "os"
"path" "path"

View File

@@ -1,7 +1,7 @@
package aufs package aufs
import ( import (
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
"os/exec" "os/exec"
"syscall" "syscall"
) )

View File

@@ -16,8 +16,8 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/dotcloud/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
) )
func init() { func init() {

View File

@@ -1,7 +1,7 @@
package btrfs package btrfs
import ( import (
"github.com/dotcloud/docker/daemon/graphdriver/graphtest" "github.com/docker/docker/daemon/graphdriver/graphtest"
"testing" "testing"
) )

View File

@@ -7,7 +7,7 @@ import (
"os" "os"
"syscall" "syscall"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func stringToLoopName(src string) [LoNameSize]uint8 { func stringToLoopName(src string) [LoNameSize]uint8 {

View File

@@ -19,9 +19,9 @@ import (
"time" "time"
"github.com/docker/libcontainer/label" "github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/dotcloud/docker/pkg/units" "github.com/docker/docker/pkg/units"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
var ( var (

View File

@@ -9,7 +9,7 @@ import (
"runtime" "runtime"
"syscall" "syscall"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
type DevmapperLogger interface { type DevmapperLogger interface {

View File

@@ -3,7 +3,7 @@
package devmapper package devmapper
import ( import (
"github.com/dotcloud/docker/daemon/graphdriver/graphtest" "github.com/docker/docker/daemon/graphdriver/graphtest"
"testing" "testing"
) )

View File

@@ -8,9 +8,9 @@ import (
"os" "os"
"path" "path"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/dotcloud/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func init() { func init() {

View File

@@ -6,8 +6,8 @@ import (
"os" "os"
"path" "path"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
) )
type FsMagic uint64 type FsMagic uint64

View File

@@ -7,7 +7,7 @@ import (
"syscall" "syscall"
"testing" "testing"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
) )
var ( var (

View File

@@ -3,7 +3,7 @@ package vfs
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/dotcloud/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"os" "os"
"os/exec" "os/exec"
"path" "path"

View File

@@ -1,7 +1,7 @@
package vfs package vfs
import ( import (
"github.com/dotcloud/docker/daemon/graphdriver/graphtest" "github.com/docker/docker/daemon/graphdriver/graphtest"
"testing" "testing"
) )

View File

@@ -4,8 +4,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
) )
func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status { func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status {

View File

@@ -1,8 +1,8 @@
package daemon package daemon
import ( import (
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/nat" "github.com/docker/docker/nat"
) )
// FIXME: move deprecated port stuff to nat to clean up the core. // FIXME: move deprecated port stuff to nat to clean up the core.

View File

@@ -9,14 +9,14 @@ import (
"sync" "sync"
"github.com/docker/libcontainer/netlink" "github.com/docker/libcontainer/netlink"
"github.com/dotcloud/docker/daemon/networkdriver" "github.com/docker/docker/daemon/networkdriver"
"github.com/dotcloud/docker/daemon/networkdriver/ipallocator" "github.com/docker/docker/daemon/networkdriver/ipallocator"
"github.com/dotcloud/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/dotcloud/docker/daemon/networkdriver/portmapper" "github.com/docker/docker/daemon/networkdriver/portmapper"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/pkg/iptables" "github.com/docker/docker/pkg/iptables"
"github.com/dotcloud/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/networkfs/resolvconf"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
const ( const (
@@ -158,7 +158,7 @@ func InitDriver(job *engine.Job) engine.Status {
bridgeNetwork = network bridgeNetwork = network
// https://github.com/dotcloud/docker/issues/2768 // https://github.com/docker/docker/issues/2768
job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP) job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP)
for name, f := range map[string]engine.Handler{ for name, f := range map[string]engine.Handler{

View File

@@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
) )
func findFreePort(t *testing.T) int { func findFreePort(t *testing.T) int {

View File

@@ -3,7 +3,7 @@ package ipallocator
import ( import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"github.com/dotcloud/docker/daemon/networkdriver" "github.com/docker/docker/daemon/networkdriver"
"net" "net"
"sync" "sync"
) )

View File

@@ -6,9 +6,9 @@ import (
"net" "net"
"sync" "sync"
"github.com/dotcloud/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/dotcloud/docker/pkg/iptables" "github.com/docker/docker/pkg/iptables"
"github.com/dotcloud/docker/pkg/proxy" "github.com/docker/docker/pkg/proxy"
) )
type mapping struct { type mapping struct {

View File

@@ -1,9 +1,9 @@
package portmapper package portmapper
import ( import (
"github.com/dotcloud/docker/daemon/networkdriver/portallocator" "github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/dotcloud/docker/pkg/iptables" "github.com/docker/docker/pkg/iptables"
"github.com/dotcloud/docker/pkg/proxy" "github.com/docker/docker/pkg/proxy"
"net" "net"
"testing" "testing"
) )

View File

@@ -1,7 +1,7 @@
package daemon package daemon
import ( import (
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
type Server interface { type Server interface {

View File

@@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/dotcloud/docker/pkg/units" "github.com/docker/docker/pkg/units"
) )
type State struct { type State struct {

View File

@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/dotcloud/docker/nat" "github.com/docker/docker/nat"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
) )
func migratePortMappings(config *runconfig.Config, hostConfig *runconfig.HostConfig) error { func migratePortMappings(config *runconfig.Config, hostConfig *runconfig.HostConfig) error {

View File

@@ -3,8 +3,8 @@ package daemon
import ( import (
"testing" "testing"
"github.com/dotcloud/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
func TestMergeLxcConfig(t *testing.T) { func TestMergeLxcConfig(t *testing.T) {

View File

@@ -8,9 +8,9 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/dotcloud/docker/archive" "github.com/docker/docker/archive"
"github.com/dotcloud/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/symlink" "github.com/docker/docker/pkg/symlink"
) )
type BindMap struct { type BindMap struct {

View File

@@ -1,8 +1,8 @@
package daemonconfig package daemonconfig
import ( import (
"github.com/dotcloud/docker/daemon/networkdriver" "github.com/docker/docker/daemon/networkdriver"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"net" "net"
) )

View File

@@ -12,15 +12,15 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/dotcloud/docker/api" "github.com/docker/docker/api"
"github.com/dotcloud/docker/api/client" "github.com/docker/docker/api/client"
"github.com/dotcloud/docker/builtins" "github.com/docker/docker/builtins"
"github.com/dotcloud/docker/dockerversion" "github.com/docker/docker/dockerversion"
"github.com/dotcloud/docker/engine" "github.com/docker/docker/engine"
"github.com/dotcloud/docker/opts" "github.com/docker/docker/opts"
flag "github.com/dotcloud/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
"github.com/dotcloud/docker/sysinit" "github.com/docker/docker/sysinit"
"github.com/dotcloud/docker/utils" "github.com/docker/docker/utils"
) )
const ( const (
@@ -154,7 +154,7 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
// handle the pidfile early. https://github.com/dotcloud/docker/issues/6973 // handle the pidfile early. https://github.com/docker/docker/issues/6973
if len(*pidfile) > 0 { if len(*pidfile) > 0 {
job := eng.Job("initserverpidfile", *pidfile) job := eng.Job("initserverpidfile", *pidfile)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
@@ -291,7 +291,7 @@ func checkKernelAndArch() error {
// Unfortunately we can't test for the feature "does not cause a kernel panic" // Unfortunately we can't test for the feature "does not cause a kernel panic"
// without actually causing a kernel panic, so we need this workaround until // without actually causing a kernel panic, so we need this workaround until
// the circumstances of pre-3.8 crashes are clearer. // the circumstances of pre-3.8 crashes are clearer.
// For details see http://github.com/dotcloud/docker/issues/407 // For details see http://github.com/docker/docker/issues/407
if k, err := utils.GetKernelVersion(); err != nil { if k, err := utils.GetKernelVersion(); err != nil {
log.Printf("WARNING: %s\n", err) log.Printf("WARNING: %s\n", err)
} else { } else {

View File

@@ -1,7 +1,7 @@
package main package main
import ( import (
"github.com/dotcloud/docker/sysinit" "github.com/docker/docker/sysinit"
) )
func main() { func main() {

View File

@@ -1,5 +1,5 @@
# #
# See the top level Makefile in https://github.com/dotcloud/docker for usage. # See the top level Makefile in https://github.com/docker/docker for usage.
# #
FROM debian:jessie FROM debian:jessie
MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit) MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
@@ -43,7 +43,7 @@ RUN VERSION=$(cat /docs/VERSION) &&\
sed -i "s/\$BUILD_DATE/$BUILD_DATE/g" /docs/theme/mkdocs/base.html &&\ sed -i "s/\$BUILD_DATE/$BUILD_DATE/g" /docs/theme/mkdocs/base.html &&\
sed -i "s/\$AWS_S3_BUCKET/$AWS_S3_BUCKET/g" /docs/theme/mkdocs/base.html sed -i "s/\$AWS_S3_BUCKET/$AWS_S3_BUCKET/g" /docs/theme/mkdocs/base.html
# note, EXPOSE is only last because of https://github.com/dotcloud/docker/issues/3525 # note, EXPOSE is only last because of https://github.com/docker/docker/issues/3525
EXPOSE 8000 EXPOSE 8000
CMD ["mkdocs", "serve"] CMD ["mkdocs", "serve"]

View File

@@ -5,7 +5,7 @@ Markdown, as implemented by [MkDocs](http://mkdocs.org).
The HTML files are built and hosted on `https://docs.docker.com`, and update The HTML files are built and hosted on `https://docs.docker.com`, and update
automatically after each change to the master or release branch of [Docker on automatically after each change to the master or release branch of [Docker on
GitHub](https://github.com/dotcloud/docker) thanks to post-commit hooks. The GitHub](https://github.com/docker/docker) thanks to post-commit hooks. The
`docs` branch maps to the "latest" documentation and the `master` (unreleased `docs` branch maps to the "latest" documentation and the `master` (unreleased
development) branch maps to the "master" documentation. development) branch maps to the "master" documentation.

View File

@@ -6,7 +6,7 @@ site_favicon: img/favicon.png
dev_addr: '0.0.0.0:8000' dev_addr: '0.0.0.0:8000'
repo_url: https://github.com/dotcloud/docker/ repo_url: https://github.com/docker/docker/
docs_dir: sources docs_dir: sources

View File

@@ -33,13 +33,13 @@ It can be as simple as this to create an Ubuntu base image:
There are more example scripts for creating base images in the Docker There are more example scripts for creating base images in the Docker
GitHub Repo: GitHub Repo:
- [BusyBox](https://github.com/dotcloud/docker/blob/master/contrib/mkimage-busybox.sh) - [BusyBox](https://github.com/docker/docker/blob/master/contrib/mkimage-busybox.sh)
- CentOS / Scientific Linux CERN (SLC) [on Debian/Ubuntu]( - CentOS / Scientific Linux CERN (SLC) [on Debian/Ubuntu](
https://github.com/dotcloud/docker/blob/master/contrib/mkimage-rinse.sh) or https://github.com/docker/docker/blob/master/contrib/mkimage-rinse.sh) or
[on CentOS/RHEL/SLC/etc.]( [on CentOS/RHEL/SLC/etc.](
https://github.com/dotcloud/docker/blob/master/contrib/mkimage-yum.sh) https://github.com/docker/docker/blob/master/contrib/mkimage-yum.sh)
- [Debian / Ubuntu]( - [Debian / Ubuntu](
https://github.com/dotcloud/docker/blob/master/contrib/mkimage-debootstrap.sh) https://github.com/docker/docker/blob/master/contrib/mkimage-debootstrap.sh)
## Creating a simple base image using `scratch` ## Creating a simple base image using `scratch`

View File

@@ -539,7 +539,7 @@ values.
It also allows the container to access local network services It also allows the container to access local network services
like D-bus. This can lead to processes in the container being like D-bus. This can lead to processes in the container being
able to do unexpected things like able to do unexpected things like
[restart your computer](https://github.com/dotcloud/docker/issues/6401). [restart your computer](https://github.com/docker/docker/issues/6401).
You should use this option with caution. You should use this option with caution.
* `--net=container:NAME_or_ID` — Tells Docker to put this container's * `--net=container:NAME_or_ID` — Tells Docker to put this container's

View File

@@ -196,7 +196,7 @@ to the host.
This won't affect regular web apps; but malicious users will find that This won't affect regular web apps; but malicious users will find that
the arsenal at their disposal has shrunk considerably! By default Docker the arsenal at their disposal has shrunk considerably! By default Docker
drops all capabilities except [those drops all capabilities except [those
needed](https://github.com/dotcloud/docker/blob/master/daemon/execdriver/native/template/default_template.go), needed](https://github.com/docker/docker/blob/master/daemon/execdriver/native/template/default_template.go),
a whitelist instead of a blacklist approach. You can see a full list of a whitelist instead of a blacklist approach. You can see a full list of
available capabilities in [Linux available capabilities in [Linux
manpages](http://man7.org/linux/man-pages/man7/capabilities.7.html). manpages](http://man7.org/linux/man-pages/man7/capabilities.7.html).
@@ -204,7 +204,7 @@ manpages](http://man7.org/linux/man-pages/man7/capabilities.7.html).
Of course, you can always enable extra capabilities if you really need Of course, you can always enable extra capabilities if you really need
them (for instance, if you want to use a FUSE-based filesystem), but by them (for instance, if you want to use a FUSE-based filesystem), but by
default, Docker containers use only a default, Docker containers use only a
[whitelist](https://github.com/dotcloud/docker/blob/master/daemon/execdriver/native/template/default_template.go) [whitelist](https://github.com/docker/docker/blob/master/daemon/execdriver/native/template/default_template.go)
of kernel capabilities by default. of kernel capabilities by default.
## Other Kernel Security Features ## Other Kernel Security Features

View File

@@ -7,18 +7,18 @@ page_keywords: contributing, docker, documentation, help, guideline
Want to hack on Docker? Awesome! Want to hack on Docker? Awesome!
The repository includes [all the instructions you need to get started]( The repository includes [all the instructions you need to get started](
https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md). https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
The [developer environment Dockerfile]( The [developer environment Dockerfile](
https://github.com/dotcloud/docker/blob/master/Dockerfile) https://github.com/docker/docker/blob/master/Dockerfile)
specifies the tools and versions used to test and build Docker. specifies the tools and versions used to test and build Docker.
If you're making changes to the documentation, see the [README.md]( If you're making changes to the documentation, see the [README.md](
https://github.com/dotcloud/docker/blob/master/docs/README.md). https://github.com/docker/docker/blob/master/docs/README.md).
The [documentation environment Dockerfile]( The [documentation environment Dockerfile](
https://github.com/dotcloud/docker/blob/master/docs/Dockerfile) https://github.com/docker/docker/blob/master/docs/Dockerfile)
specifies the tools and versions used to build the Documentation. specifies the tools and versions used to build the Documentation.
Further interesting details can be found in the [Packaging hints]( Further interesting details can be found in the [Packaging hints](
https://github.com/dotcloud/docker/blob/master/hack/PACKAGERS.md). https://github.com/docker/docker/blob/master/hack/PACKAGERS.md).

View File

@@ -32,7 +32,7 @@ Again, you can do it in other ways but you need to do more work.
## Check out the Source ## Check out the Source
$ git clone https://git@github.com/dotcloud/docker $ git clone https://git@github.com/docker/docker
$ cd docker $ cd docker
To checkout a different revision just use `git checkout` To checkout a different revision just use `git checkout`
@@ -110,7 +110,7 @@ something like this
=== RUN TestDependencyGraph === RUN TestDependencyGraph
--- PASS: TestDependencyGraph (0.00 seconds) --- PASS: TestDependencyGraph (0.00 seconds)
PASS PASS
ok github.com/dotcloud/docker/utils 0.017s ok github.com/docker/docker/utils 0.017s
If $TESTFLAGS is set in the environment, it is passed as extra arguments If $TESTFLAGS is set in the environment, it is passed as extra arguments
to `go test`. You can use this to select certain tests to run, e.g., to `go test`. You can use this to select certain tests to run, e.g.,

View File

@@ -65,7 +65,7 @@ optimized and up-to-date image to power your applications.
> **Note:** > **Note:**
> If you would like to contribute an official repository for your > If you would like to contribute an official repository for your
> organization, product or team you can see more information > organization, product or team you can see more information
> [here](https://github.com/dotcloud/stackbrew). > [here](https://github.com/docker/stackbrew).
## Private Docker Repositories ## Private Docker Repositories

View File

@@ -74,7 +74,7 @@ Almost there. Next, we add a hack to get us by the lack of
`initctl`: `initctl`:
# Hack for initctl # Hack for initctl
# See: https://github.com/dotcloud/docker/issues/1024 # See: https://github.com/docker/docker/issues/1024
RUN dpkg-divert --local --rename --add /sbin/initctl RUN dpkg-divert --local --rename --add /sbin/initctl
RUN ln -s /bin/true /sbin/initctl RUN ln -s /bin/true /sbin/initctl

View File

@@ -14,8 +14,8 @@ paying.
### What open source license are you using? ### What open source license are you using?
We are using the Apache License Version 2.0, see it here: We are using the Apache License Version 2.0, see it here:
[https://github.com/dotcloud/docker/blob/master/LICENSE]( [https://github.com/docker/docker/blob/master/LICENSE](
https://github.com/dotcloud/docker/blob/master/LICENSE) https://github.com/docker/docker/blob/master/LICENSE)
### Does Docker run on Mac OS X or Windows? ### Does Docker run on Mac OS X or Windows?
@@ -227,7 +227,7 @@ OpenSSL library vulnerable to the [Heartbleed](http://heartbleed.com/) bug.
### Can I help by adding some questions and answers? ### Can I help by adding some questions and answers?
Definitely! You can fork [the repo](https://github.com/dotcloud/docker) and Definitely! You can fork [the repo](https://github.com/docker/docker) and
edit the documentation sources. edit the documentation sources.
### Where can I find more answers? ### Where can I find more answers?
@@ -237,7 +237,7 @@ You can find more answers on:
- [Docker user mailinglist](https://groups.google.com/d/forum/docker-user) - [Docker user mailinglist](https://groups.google.com/d/forum/docker-user)
- [Docker developer mailinglist](https://groups.google.com/d/forum/docker-dev) - [Docker developer mailinglist](https://groups.google.com/d/forum/docker-dev)
- [IRC, docker on freenode](irc://chat.freenode.net#docker) - [IRC, docker on freenode](irc://chat.freenode.net#docker)
- [GitHub](https://github.com/dotcloud/docker) - [GitHub](https://github.com/docker/docker)
- [Ask questions on Stackoverflow](http://stackoverflow.com/search?q=docker) - [Ask questions on Stackoverflow](http://stackoverflow.com/search?q=docker)
- [Join the conversation on Twitter](http://twitter.com/docker) - [Join the conversation on Twitter](http://twitter.com/docker)

View File

@@ -94,7 +94,7 @@ To learn about Docker in more detail and to answer questions about usage and imp
*`.dockerignore` support* *`.dockerignore` support*
You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will ignore files and directories specified in that file when sending the build context to the daemon. You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will ignore files and directories specified in that file when sending the build context to the daemon.
Example: https://github.com/dotcloud/docker/blob/master/.dockerignore Example: https://github.com/docker/docker/blob/master/.dockerignore
*Pause containers during commit* *Pause containers during commit*

View File

@@ -23,9 +23,9 @@ runtime:
- a [properly mounted]( - a [properly mounted](
https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount) https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount)
cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount
point [is](https://github.com/dotcloud/docker/issues/2683) point [is](https://github.com/docker/docker/issues/2683)
[not](https://github.com/dotcloud/docker/issues/3485) [not](https://github.com/docker/docker/issues/3485)
[sufficient](https://github.com/dotcloud/docker/issues/4568)) [sufficient](https://github.com/docker/docker/issues/4568))
## Check kernel dependencies ## Check kernel dependencies

View File

@@ -421,7 +421,7 @@ Registering a new account.
Accept: application/json Accept: application/json
Content-Type: application/json Content-Type: application/json
{"email": "sam@dotcloud.com", {"email": "sam@docker.com",
"password": "toto42", "password": "toto42",
"username": "foobar"} "username": "foobar"}
@@ -468,7 +468,7 @@ Change a password or email address for given user. If you pass in an
Content-Type: application/json Content-Type: application/json
Authorization: Basic akmklmasadalkm== Authorization: Basic akmklmasadalkm==
{"email": "sam@dotcloud.com", {"email": "sam@docker.com",
"password": "toto42"} "password": "toto42"}
Parameters: Parameters:

View File

@@ -374,7 +374,7 @@ Image's name added in the events
## v1.3 ## v1.3
docker v0.5.0 docker v0.5.0
[51f6c4a](https://github.com/dotcloud/docker/commit/51f6c4a7372450d164c61e0054daf0223ddbd909) [51f6c4a](https://github.com/docker/docker/commit/51f6c4a7372450d164c61e0054daf0223ddbd909)
### Full Documentation ### Full Documentation
@@ -414,7 +414,7 @@ Start containers (/containers/<id>/start):
## v1.2 ## v1.2
docker v0.4.2 docker v0.4.2
[2e7649b](https://github.com/dotcloud/docker/commit/2e7649beda7c820793bd46766cbc2cfeace7b168) [2e7649b](https://github.com/docker/docker/commit/2e7649beda7c820793bd46766cbc2cfeace7b168)
### Full Documentation ### Full Documentation
@@ -446,7 +446,7 @@ deleted/untagged.
## v1.1 ## v1.1
docker v0.4.0 docker v0.4.0
[a8ae398](https://github.com/dotcloud/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f) [a8ae398](https://github.com/docker/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f)
### Full Documentation ### Full Documentation
@@ -473,7 +473,7 @@ Uses json stream instead of HTML hijack, it looks like this:
## v1.0 ## v1.0
docker v0.3.4 docker v0.3.4
[8d73740](https://github.com/dotcloud/docker/commit/8d73740343778651c09160cde9661f5f387b36f4) [8d73740](https://github.com/docker/docker/commit/8d73740343778651c09160cde9661f5f387b36f4)
### Full Documentation ### Full Documentation

View File

@@ -194,7 +194,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {} "Volumes": {}
} }

View File

@@ -194,7 +194,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {} "Volumes": {}
} }

View File

@@ -220,7 +220,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {}, "Volumes": {},
"HostConfig": { "HostConfig": {

View File

@@ -224,7 +224,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {}, "Volumes": {},
"HostConfig": { "HostConfig": {

View File

@@ -224,7 +224,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {}, "Volumes": {},
"HostConfig": { "HostConfig": {

View File

@@ -224,7 +224,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {}, "Volumes": {},
"HostConfig": { "HostConfig": {

View File

@@ -224,7 +224,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {}, "Volumes": {},
"HostConfig": { "HostConfig": {

View File

@@ -206,7 +206,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {} "Volumes": {}
} }

View File

@@ -208,7 +208,7 @@ Return low-level information on the container `id`
"Bridge": "", "Bridge": "",
"PortMapping": null "PortMapping": null
}, },
"SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker", "SysInitPath": "/home/kitty/go/src/github.com/docker/docker/bin/docker",
"ResolvConfPath": "/etc/resolv.conf", "ResolvConfPath": "/etc/resolv.conf",
"Volumes": {} "Volumes": {}
} }

Some files were not shown because too many files have changed in this diff Show More