From b3ee9ac74e171e00f14027e39278013629e681b8 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 24 Jul 2014 22:19:50 +0000 Subject: [PATCH] update go import path and libcontainer Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- AUTHORS | 4 +- CONTRIBUTING.md | 6 +- Dockerfile | 8 +- Makefile | 2 +- api/client/cli.go | 6 +- api/client/commands.go | 26 +++--- api/client/hijack.go | 8 +- api/client/utils.go | 12 +-- api/common.go | 6 +- api/server/server.go | 16 ++-- api/server/server_unit_test.go | 6 +- archive/archive.go | 6 +- archive/archive_test.go | 2 +- archive/changes.go | 6 +- archive/diff.go | 2 +- archive/wrap.go | 2 +- builtins/builtins.go | 16 ++-- contrib/docker-device-tool/device_tool.go | 2 +- contrib/host-integration/Dockerfile.dev | 2 +- contrib/host-integration/manager.go | 2 +- contrib/host-integration/manager.sh | 2 +- contrib/init/sysvinit-redhat/docker | 2 +- contrib/mkimage-debootstrap.sh | 2 +- contrib/mkimage/debootstrap | 2 +- contrib/prepare-commit-msg.hook | 2 +- daemon/attach.go | 2 +- daemon/container.go | 26 +++--- daemon/container_unit_test.go | 2 +- daemon/daemon.go | 42 +++++----- daemon/daemon_aufs.go | 8 +- daemon/daemon_btrfs.go | 2 +- daemon/daemon_devicemapper.go | 2 +- daemon/daemon_no_aufs.go | 2 +- daemon/execdriver/execdrivers/execdrivers.go | 8 +- daemon/execdriver/lxc/driver.go | 6 +- daemon/execdriver/lxc/init.go | 2 +- daemon/execdriver/lxc/lxc_init_linux.go | 6 +- daemon/execdriver/lxc/lxc_init_unsupported.go | 2 +- daemon/execdriver/lxc/lxc_template.go | 2 +- .../execdriver/lxc/lxc_template_unit_test.go | 2 +- .../execdriver/native/configuration/parse.go | 2 +- .../native/configuration/parse_test.go | 2 +- daemon/execdriver/native/create.go | 6 +- daemon/execdriver/native/driver.go | 6 +- .../execdriver/native/driver_unsupported.go | 2 +- .../native/driver_unsupported_nocgo.go | 2 +- daemon/execdriver/utils.go | 2 +- daemon/graphdriver/aufs/aufs.go | 8 +- daemon/graphdriver/aufs/aufs_test.go | 4 +- daemon/graphdriver/aufs/mount.go | 2 +- daemon/graphdriver/btrfs/btrfs.go | 4 +- daemon/graphdriver/btrfs/btrfs_test.go | 2 +- .../graphdriver/devmapper/attach_loopback.go | 2 +- daemon/graphdriver/devmapper/deviceset.go | 6 +- daemon/graphdriver/devmapper/devmapper.go | 2 +- .../graphdriver/devmapper/devmapper_test.go | 2 +- daemon/graphdriver/devmapper/driver.go | 6 +- daemon/graphdriver/driver.go | 4 +- daemon/graphdriver/graphtest/graphtest.go | 2 +- daemon/graphdriver/vfs/driver.go | 2 +- daemon/graphdriver/vfs/vfs_test.go | 2 +- daemon/inspect.go | 4 +- daemon/network_settings.go | 4 +- daemon/networkdriver/bridge/driver.go | 18 ++-- daemon/networkdriver/bridge/driver_test.go | 2 +- daemon/networkdriver/ipallocator/allocator.go | 2 +- daemon/networkdriver/portmapper/mapper.go | 6 +- .../networkdriver/portmapper/mapper_test.go | 6 +- daemon/server.go | 2 +- daemon/state.go | 2 +- daemon/utils.go | 4 +- daemon/utils_test.go | 4 +- daemon/volumes.go | 6 +- daemonconfig/config.go | 4 +- docker/docker.go | 22 ++--- dockerinit/dockerinit.go | 2 +- docs/Dockerfile | 4 +- docs/README.md | 2 +- docs/mkdocs.yml | 2 +- docs/sources/articles/baseimages.md | 8 +- docs/sources/articles/networking.md | 2 +- docs/sources/articles/security.md | 4 +- docs/sources/contributing/contributing.md | 10 +-- docs/sources/contributing/devenvironment.md | 4 +- docs/sources/docker-hub/repos.md | 2 +- docs/sources/examples/running_riak_service.md | 2 +- docs/sources/faq.md | 8 +- docs/sources/index.md | 2 +- docs/sources/installation/binaries.md | 6 +- docs/sources/reference/api/docker-io_api.md | 4 +- .../reference/api/docker_remote_api.md | 8 +- .../reference/api/docker_remote_api_v1.0.md | 2 +- .../reference/api/docker_remote_api_v1.1.md | 2 +- .../reference/api/docker_remote_api_v1.10.md | 2 +- .../reference/api/docker_remote_api_v1.11.md | 2 +- .../reference/api/docker_remote_api_v1.12.md | 2 +- .../reference/api/docker_remote_api_v1.13.md | 2 +- .../reference/api/docker_remote_api_v1.14.md | 2 +- .../reference/api/docker_remote_api_v1.2.md | 2 +- .../reference/api/docker_remote_api_v1.3.md | 2 +- .../reference/api/docker_remote_api_v1.4.md | 2 +- .../reference/api/docker_remote_api_v1.5.md | 2 +- .../reference/api/docker_remote_api_v1.6.md | 2 +- .../reference/api/docker_remote_api_v1.7.md | 2 +- .../reference/api/docker_remote_api_v1.8.md | 2 +- .../reference/api/docker_remote_api_v1.9.md | 2 +- .../reference/api/hub_registry_spec.md | 4 +- docs/sources/reference/builder.md | 2 +- docs/sources/reference/commandline/cli.md | 12 +-- docs/sources/reference/run.md | 6 +- docs/sources/userguide/dockerimages.md | 2 +- docs/sources/userguide/index.md | 2 +- docs/theme/mkdocs/base.html | 2 +- docs/theme/mkdocs/breadcrumbs.html | 2 +- docs/theme/mkdocs/footer.html | 2 +- engine/engine.go | 2 +- engine/env_test.go | 2 +- graph/graph.go | 14 ++-- graph/service.go | 6 +- graph/tags.go | 4 +- graph/tags_unit_test.go | 10 +-- hack/PACKAGERS.md | 10 +-- hack/RELEASE-CHECKLIST.md | 8 +- hack/ROADMAP.md | 2 +- hack/dind | 2 +- hack/make.sh | 16 ++-- hack/make/.ensure-scratch | 4 +- hack/make/.validate | 2 +- hack/make/dynbinary | 2 +- hack/make/dyntest-integration | 2 +- hack/make/dyntest-unit | 2 +- hack/make/test-integration | 2 +- hack/make/validate-dco | 4 +- hack/release.sh | 6 +- hack/vendor.sh | 2 +- image/graph.go | 2 +- image/image.go | 8 +- integration-cli/docker_cli_build_test.go | 2 +- integration-cli/docker_cli_links_test.go | 2 +- integration-cli/docker_cli_nat_test.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- integration/api_test.go | 10 +-- integration/auth_test.go | 9 +- integration/commands_test.go | 10 +-- integration/container_test.go | 2 +- integration/graph_test.go | 12 +-- integration/https_test.go | 2 +- integration/runtime_test.go | 14 ++-- integration/server_test.go | 4 +- integration/utils_test.go | 14 ++-- integration/z_final_test.go | 2 +- links/links.go | 4 +- links/links_test.go | 2 +- nat/nat.go | 2 +- opts/opts.go | 2 +- pkg/mflag/example/example.go | 2 +- pkg/mflag/flag.go | 2 +- pkg/mflag/flag_test.go | 2 +- pkg/term/MAINTAINERS | 2 +- pkg/truncindex/truncindex_test.go | 2 +- registry/MAINTAINERS | 6 +- registry/auth.go | 4 +- registry/registry.go | 4 +- registry/registry_mock_test.go | 2 +- registry/registry_test.go | 4 +- registry/service.go | 2 +- runconfig/config.go | 4 +- runconfig/config_test.go | 2 +- runconfig/hostconfig.go | 6 +- runconfig/merge.go | 4 +- runconfig/parse.go | 12 +-- runconfig/parse_test.go | 2 +- server/buildfile.go | 16 ++-- server/server.go | 28 +++---- server/server_unit_test.go | 2 +- sysinit/sysinit.go | 6 +- utils/broadcastwriter/broadcastwriter.go | 2 +- utils/jsonmessage.go | 4 +- utils/tarsum.go | 2 +- utils/tarsum_test.go | 2 +- utils/utils.go | 2 +- utils/utils_test.go | 12 +-- .../docker/libcontainer/.travis.yml | 11 +-- .../github.com/docker/libcontainer/Dockerfile | 19 ++++- .../github.com/docker/libcontainer/Makefile | 10 +++ .../cgroups/systemd/apply_systemd.go | 2 +- .../docker/libcontainer/cgroups/utils.go | 4 +- .../docker/libcontainer/devices/defaults.go | 4 +- .../docker/libcontainer/mount/init.go | 36 +++++++- .../docker/libcontainer/namespaces/execin.go | 82 +++++++++++++++++-- .../docker/libcontainer/namespaces/init.go | 2 +- .../docker/libcontainer/namespaces/nsenter.go | 35 ++++++++ .../libcontainer/netlink/netlink_linux.go | 73 +++++++++++++---- .../netlink/netlink_linux_test.go | 55 +++++++++++++ .../netlink/netlink_unsupported.go | 4 + .../docker/libcontainer/network/stats.go | 41 +++++----- .../docker/libcontainer/nsinit/exec.go | 57 ++++++++++++- .../docker/libcontainer/nsinit/nsenter.go | 1 + .../docker/libcontainer/selinux/selinux.go | 2 +- .../github.com/docker/libcontainer/types.go | 4 +- 200 files changed, 828 insertions(+), 515 deletions(-) create mode 100644 vendor/src/github.com/docker/libcontainer/Makefile create mode 100644 vendor/src/github.com/docker/libcontainer/netlink/netlink_linux_test.go diff --git a/AUTHORS b/AUTHORS index 10f01fb589..a83074b1d4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -193,7 +193,7 @@ Jean-Baptiste Barth Jean-Baptiste Dalido Jeff Lindsay Jeremy Grosser -Jérôme Petazzoni +Jérôme Petazzoni Jesse Dubay Jilles Oldenbeuving Jim Alateras @@ -418,7 +418,7 @@ Tzu-Jung Lee Ulysse Carion unclejack vgeta -Victor Coisne +Victor Coisne Victor Lyuboslavsky Victor Marmol Victor Vieux diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2dc73c100d..8320d7cffa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ feels wrong or incomplete. ## 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). Please include: @@ -53,7 +53,7 @@ else is working on the same thing. ### Create issues... 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. ### ...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: ``` -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` diff --git a/Dockerfile b/Dockerfile index 48d3f45d73..5369962359 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # docker build -t docker . # # # 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: # 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 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 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 # Compile Go for cross compilation @@ -94,11 +94,11 @@ RUN groupadd -r docker RUN useradd --create-home --gid docker unprivilegeduser VOLUME /var/lib/docker -WORKDIR /go/src/github.com/dotcloud/docker +WORKDIR /go/src/github.com/docker/docker ENV DOCKER_BUILDTAGS apparmor selinux # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] # Upload docker source -COPY . /go/src/github.com/dotcloud/docker +COPY . /go/src/github.com/docker/docker diff --git a/Makefile b/Makefile index 71a3f32ec6..40c623a47a 100644 --- a/Makefile +++ b/Makefile @@ -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) DOCKER_IMAGE := docker$(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)" # to allow `make DOCSDIR=docs docs-shell` diff --git a/api/client/cli.go b/api/client/cli.go index bb5d191e16..0b7ffeaa23 100644 --- a/api/client/cli.go +++ b/api/client/cli.go @@ -10,9 +10,9 @@ import ( "strings" "text/template" - flag "github.com/dotcloud/docker/pkg/mflag" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/registry" + flag "github.com/docker/docker/pkg/mflag" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/registry" ) var funcMap = template.FuncMap{ diff --git a/api/client/commands.go b/api/client/commands.go index 056bd27bc3..1853b513fe 100644 --- a/api/client/commands.go +++ b/api/client/commands.go @@ -22,19 +22,19 @@ import ( "text/template" "time" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/opts" - "github.com/dotcloud/docker/pkg/signal" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/pkg/units" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/utils/filters" + "github.com/docker/docker/api" + "github.com/docker/docker/archive" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/nat" + "github.com/docker/docker/opts" + "github.com/docker/docker/pkg/signal" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/pkg/units" + "github.com/docker/docker/registry" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" + "github.com/docker/docker/utils/filters" ) const ( diff --git a/api/client/hijack.go b/api/client/hijack.go index 1cb7ebf1c4..1dc0748f8f 100644 --- a/api/client/hijack.go +++ b/api/client/hijack.go @@ -11,10 +11,10 @@ import ( "runtime" "strings" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/utils" ) func (cli *DockerCli) dial() (net.Conn, error) { diff --git a/api/client/utils.go b/api/client/utils.go index 13b5241d15..d677242fa7 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -17,12 +17,12 @@ import ( "strings" "syscall" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/registry" + "github.com/docker/docker/utils" ) var ( diff --git a/api/common.go b/api/common.go index 228c9fc1ff..5a03cf6ffe 100644 --- a/api/common.go +++ b/api/common.go @@ -5,9 +5,9 @@ import ( "mime" "strings" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/version" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/version" + "github.com/docker/docker/utils" ) const ( diff --git a/api/server/server.go b/api/server/server.go index 56b767c405..440a468e69 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -22,14 +22,14 @@ import ( "code.google.com/p/go.net/websocket" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/listenbuffer" - "github.com/dotcloud/docker/pkg/systemd" - "github.com/dotcloud/docker/pkg/user" - "github.com/dotcloud/docker/pkg/version" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/listenbuffer" + "github.com/docker/docker/pkg/systemd" + "github.com/docker/docker/pkg/user" + "github.com/docker/docker/pkg/version" + "github.com/docker/docker/registry" + "github.com/docker/docker/utils" "github.com/gorilla/mux" ) diff --git a/api/server/server_unit_test.go b/api/server/server_unit_test.go index 6814ca8a47..41b2581ce9 100644 --- a/api/server/server_unit_test.go +++ b/api/server/server_unit_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/version" + "github.com/docker/docker/api" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/version" ) func TestGetBoolParam(t *testing.T) { diff --git a/archive/archive.go b/archive/archive.go index 550ef3f040..44f2fe92d8 100644 --- a/archive/archive.go +++ b/archive/archive.go @@ -16,9 +16,9 @@ import ( "strings" "syscall" - "github.com/dotcloud/docker/pkg/system" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/docker/docker/pkg/system" + "github.com/docker/docker/utils" + "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) type ( diff --git a/archive/archive_test.go b/archive/archive_test.go index 1a68234129..6afe298317 100644 --- a/archive/archive_test.go +++ b/archive/archive_test.go @@ -11,7 +11,7 @@ import ( "testing" "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) { diff --git a/archive/changes.go b/archive/changes.go index 154a527aec..859c8aa07e 100644 --- a/archive/changes.go +++ b/archive/changes.go @@ -11,9 +11,9 @@ import ( "syscall" "time" - "github.com/dotcloud/docker/pkg/system" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/docker/docker/pkg/system" + "github.com/docker/docker/utils" + "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) type ChangeType int diff --git a/archive/diff.go b/archive/diff.go index 34a887663d..a805f2c0a1 100644 --- a/archive/diff.go +++ b/archive/diff.go @@ -10,7 +10,7 @@ import ( "strings" "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. diff --git a/archive/wrap.go b/archive/wrap.go index 03ea5083ac..b8b60197a3 100644 --- a/archive/wrap.go +++ b/archive/wrap.go @@ -2,7 +2,7 @@ package archive import ( "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" ) diff --git a/builtins/builtins.go b/builtins/builtins.go index bac130c8df..a42dec619e 100644 --- a/builtins/builtins.go +++ b/builtins/builtins.go @@ -3,14 +3,14 @@ package builtins import ( "runtime" - "github.com/dotcloud/docker/api" - apiserver "github.com/dotcloud/docker/api/server" - "github.com/dotcloud/docker/daemon/networkdriver/bridge" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/server" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api" + apiserver "github.com/docker/docker/api/server" + "github.com/docker/docker/daemon/networkdriver/bridge" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/registry" + "github.com/docker/docker/server" + "github.com/docker/docker/utils" ) func Register(eng *engine.Engine) error { diff --git a/contrib/docker-device-tool/device_tool.go b/contrib/docker-device-tool/device_tool.go index a9327f9de1..23d19f0237 100644 --- a/contrib/docker-device-tool/device_tool.go +++ b/contrib/docker-device-tool/device_tool.go @@ -3,7 +3,7 @@ package main import ( "flag" "fmt" - "github.com/dotcloud/docker/daemon/graphdriver/devmapper" + "github.com/docker/docker/daemon/graphdriver/devmapper" "os" "path" "sort" diff --git a/contrib/host-integration/Dockerfile.dev b/contrib/host-integration/Dockerfile.dev index 800216532f..1c0fbd8323 100644 --- a/contrib/host-integration/Dockerfile.dev +++ b/contrib/host-integration/Dockerfile.dev @@ -19,7 +19,7 @@ ENV GOROOT /goroot ENV GOPATH /go 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/ RUN cd /manager && go build -o /usr/bin/manager diff --git a/contrib/host-integration/manager.go b/contrib/host-integration/manager.go index 2798a5d06f..c0b488b2f1 100644 --- a/contrib/host-integration/manager.go +++ b/contrib/host-integration/manager.go @@ -5,7 +5,7 @@ import ( "encoding/json" "flag" "fmt" - "github.com/dotcloud/docker" + "github.com/docker/docker" "os" "strings" "text/template" diff --git a/contrib/host-integration/manager.sh b/contrib/host-integration/manager.sh index fecf4bf64b..8ea296f5a5 100755 --- a/contrib/host-integration/manager.sh +++ b/contrib/host-integration/manager.sh @@ -37,7 +37,7 @@ if [ ! -e "manager/$script" ]; then exit 1 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 # image="$(docker inspect -f '{{.Image}}' "$cid")" # if [ "$image" ]; then diff --git a/contrib/init/sysvinit-redhat/docker b/contrib/init/sysvinit-redhat/docker index aa94c04811..0c985094e6 100755 --- a/contrib/init/sysvinit-redhat/docker +++ b/contrib/init/sysvinit-redhat/docker @@ -50,7 +50,7 @@ start() { pid=$! touch $lockfile # 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 while [ ! -f $pidfile -a $tries -lt 10 ]; do sleep 1 diff --git a/contrib/mkimage-debootstrap.sh b/contrib/mkimage-debootstrap.sh index 0a3df140db..d9d6aae636 100755 --- a/contrib/mkimage-debootstrap.sh +++ b/contrib/mkimage-debootstrap.sh @@ -144,7 +144,7 @@ if [ -z "$strictDebootstrap" ]; then # initctl (for some pesky upstart scripts) sudo chroot . dpkg-divert --local --rename --add /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) sudo chroot . apt-get clean diff --git a/contrib/mkimage/debootstrap b/contrib/mkimage/debootstrap index 78afe50bb2..3702797ee1 100755 --- a/contrib/mkimage/debootstrap +++ b/contrib/mkimage/debootstrap @@ -83,7 +83,7 @@ if [ -d "$rootfsDir/etc/apt/apt.conf.d" ]; then Dir::Cache::srcpkgcache ""; # 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 # remove apt-cache translations for fast "apt-get update" diff --git a/contrib/prepare-commit-msg.hook b/contrib/prepare-commit-msg.hook index b0fe0bf675..c9389fb6d2 100644 --- a/contrib/prepare-commit-msg.hook +++ b/contrib/prepare-commit-msg.hook @@ -1,6 +1,6 @@ #!/bin/sh # 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) SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p") diff --git a/daemon/attach.go b/daemon/attach.go index 0e3b8b8a9d..665d4a20af 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -3,7 +3,7 @@ package daemon import ( "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 { diff --git a/daemon/container.go b/daemon/container.go index fd3d79659f..e80c661eef 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -17,19 +17,19 @@ import ( "github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/label" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/links" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/pkg/networkfs/etchosts" - "github.com/dotcloud/docker/pkg/networkfs/resolvconf" - "github.com/dotcloud/docker/pkg/symlink" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/utils/broadcastwriter" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/engine" + "github.com/docker/docker/image" + "github.com/docker/docker/links" + "github.com/docker/docker/nat" + "github.com/docker/docker/pkg/networkfs/etchosts" + "github.com/docker/docker/pkg/networkfs/resolvconf" + "github.com/docker/docker/pkg/symlink" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" + "github.com/docker/docker/utils/broadcastwriter" ) const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" diff --git a/daemon/container_unit_test.go b/daemon/container_unit_test.go index 0a8e69ab00..7520017c10 100644 --- a/daemon/container_unit_test.go +++ b/daemon/container_unit_test.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/nat" "testing" ) diff --git a/daemon/daemon.go b/daemon/daemon.go index 8d7d7764bc..646af18e04 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -13,27 +13,27 @@ import ( "time" "github.com/docker/libcontainer/label" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/daemon/execdriver/execdrivers" - "github.com/dotcloud/docker/daemon/execdriver/lxc" - "github.com/dotcloud/docker/daemon/graphdriver" - _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" - _ "github.com/dotcloud/docker/daemon/networkdriver/bridge" - "github.com/dotcloud/docker/daemon/networkdriver/portallocator" - "github.com/dotcloud/docker/daemonconfig" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/graph" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/pkg/graphdb" - "github.com/dotcloud/docker/pkg/namesgenerator" - "github.com/dotcloud/docker/pkg/networkfs/resolvconf" - "github.com/dotcloud/docker/pkg/sysinfo" - "github.com/dotcloud/docker/pkg/truncindex" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/utils/broadcastwriter" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver/execdrivers" + "github.com/docker/docker/daemon/execdriver/lxc" + "github.com/docker/docker/daemon/graphdriver" + _ "github.com/docker/docker/daemon/graphdriver/vfs" + _ "github.com/docker/docker/daemon/networkdriver/bridge" + "github.com/docker/docker/daemon/networkdriver/portallocator" + "github.com/docker/docker/daemonconfig" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/graph" + "github.com/docker/docker/image" + "github.com/docker/docker/pkg/graphdb" + "github.com/docker/docker/pkg/namesgenerator" + "github.com/docker/docker/pkg/networkfs/resolvconf" + "github.com/docker/docker/pkg/sysinfo" + "github.com/docker/docker/pkg/truncindex" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" + "github.com/docker/docker/utils/broadcastwriter" ) // Set the max depth to the aufs default that most diff --git a/daemon/daemon_aufs.go b/daemon/daemon_aufs.go index ee3e1d1a58..12108888bb 100644 --- a/daemon/daemon_aufs.go +++ b/daemon/daemon_aufs.go @@ -3,10 +3,10 @@ package daemon import ( - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/daemon/graphdriver/aufs" - "github.com/dotcloud/docker/graph" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/daemon/graphdriver/aufs" + "github.com/docker/docker/graph" + "github.com/docker/docker/utils" ) // Given the graphdriver ad, if it is aufs, then migrate it. diff --git a/daemon/daemon_btrfs.go b/daemon/daemon_btrfs.go index f343d699c4..cd505c356b 100644 --- a/daemon/daemon_btrfs.go +++ b/daemon/daemon_btrfs.go @@ -3,5 +3,5 @@ package daemon import ( - _ "github.com/dotcloud/docker/daemon/graphdriver/btrfs" + _ "github.com/docker/docker/daemon/graphdriver/btrfs" ) diff --git a/daemon/daemon_devicemapper.go b/daemon/daemon_devicemapper.go index ddf8107414..477754559a 100644 --- a/daemon/daemon_devicemapper.go +++ b/daemon/daemon_devicemapper.go @@ -3,5 +3,5 @@ package daemon import ( - _ "github.com/dotcloud/docker/daemon/graphdriver/devmapper" + _ "github.com/docker/docker/daemon/graphdriver/devmapper" ) diff --git a/daemon/daemon_no_aufs.go b/daemon/daemon_no_aufs.go index 2d9fed29b9..06cdc776d7 100644 --- a/daemon/daemon_no_aufs.go +++ b/daemon/daemon_no_aufs.go @@ -3,7 +3,7 @@ package daemon import ( - "github.com/dotcloud/docker/daemon/graphdriver" + "github.com/docker/docker/daemon/graphdriver" ) func migrateIfAufs(driver graphdriver.Driver, root string) error { diff --git a/daemon/execdriver/execdrivers/execdrivers.go b/daemon/execdriver/execdrivers/execdrivers.go index f43514408b..2a050b4834 100644 --- a/daemon/execdriver/execdrivers/execdrivers.go +++ b/daemon/execdriver/execdrivers/execdrivers.go @@ -2,10 +2,10 @@ package execdrivers import ( "fmt" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/daemon/execdriver/lxc" - "github.com/dotcloud/docker/daemon/execdriver/native" - "github.com/dotcloud/docker/pkg/sysinfo" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver/lxc" + "github.com/docker/docker/daemon/execdriver/native" + "github.com/docker/docker/pkg/sysinfo" "path" ) diff --git a/daemon/execdriver/lxc/driver.go b/daemon/execdriver/lxc/driver.go index fe3a3ce228..ffe7833a05 100644 --- a/daemon/execdriver/lxc/driver.go +++ b/daemon/execdriver/lxc/driver.go @@ -19,9 +19,9 @@ import ( "github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/label" "github.com/docker/libcontainer/mount/nodes" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/utils" "github.com/kr/pty" ) diff --git a/daemon/execdriver/lxc/init.go b/daemon/execdriver/lxc/init.go index 1af7730cae..45ad1d1bc0 100644 --- a/daemon/execdriver/lxc/init.go +++ b/daemon/execdriver/lxc/init.go @@ -10,7 +10,7 @@ import ( "syscall" "github.com/docker/libcontainer/netlink" - "github.com/dotcloud/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver" ) // Clear environment pollution introduced by lxc-start diff --git a/daemon/execdriver/lxc/lxc_init_linux.go b/daemon/execdriver/lxc/lxc_init_linux.go index 40956e442b..1d0b395217 100644 --- a/daemon/execdriver/lxc/lxc_init_linux.go +++ b/daemon/execdriver/lxc/lxc_init_linux.go @@ -10,9 +10,9 @@ import ( "github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/security/capabilities" "github.com/docker/libcontainer/utils" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/daemon/execdriver/native/template" - "github.com/dotcloud/docker/pkg/system" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver/native/template" + "github.com/docker/docker/pkg/system" ) func setHostname(hostname string) error { diff --git a/daemon/execdriver/lxc/lxc_init_unsupported.go b/daemon/execdriver/lxc/lxc_init_unsupported.go index 079446e186..8311ba6e24 100644 --- a/daemon/execdriver/lxc/lxc_init_unsupported.go +++ b/daemon/execdriver/lxc/lxc_init_unsupported.go @@ -2,7 +2,7 @@ package lxc -import "github.com/dotcloud/docker/daemon/execdriver" +import "github.com/docker/docker/daemon/execdriver" func setHostname(hostname string) error { panic("Not supported on darwin") diff --git a/daemon/execdriver/lxc/lxc_template.go b/daemon/execdriver/lxc/lxc_template.go index 88618f07fd..c831564b87 100644 --- a/daemon/execdriver/lxc/lxc_template.go +++ b/daemon/execdriver/lxc/lxc_template.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/docker/libcontainer/label" - "github.com/dotcloud/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver" ) const LxcTemplate = ` diff --git a/daemon/execdriver/lxc/lxc_template_unit_test.go b/daemon/execdriver/lxc/lxc_template_unit_test.go index 19501adb65..a7c2bf682e 100644 --- a/daemon/execdriver/lxc/lxc_template_unit_test.go +++ b/daemon/execdriver/lxc/lxc_template_unit_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/docker/libcontainer/devices" - "github.com/dotcloud/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver" ) func TestLXCConfig(t *testing.T) { diff --git a/daemon/execdriver/native/configuration/parse.go b/daemon/execdriver/native/configuration/parse.go index 8fb1b452b9..7aba4820ab 100644 --- a/daemon/execdriver/native/configuration/parse.go +++ b/daemon/execdriver/native/configuration/parse.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/docker/libcontainer" - "github.com/dotcloud/docker/pkg/units" + "github.com/docker/docker/pkg/units" ) type Action func(*libcontainer.Config, interface{}, string) error diff --git a/daemon/execdriver/native/configuration/parse_test.go b/daemon/execdriver/native/configuration/parse_test.go index 0401d7b37e..8b1d275aed 100644 --- a/daemon/execdriver/native/configuration/parse_test.go +++ b/daemon/execdriver/native/configuration/parse_test.go @@ -4,7 +4,7 @@ import ( "testing" "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. diff --git a/daemon/execdriver/native/create.go b/daemon/execdriver/native/create.go index 280ad70a6e..e602e49a06 100644 --- a/daemon/execdriver/native/create.go +++ b/daemon/execdriver/native/create.go @@ -13,9 +13,9 @@ import ( "github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/mount" "github.com/docker/libcontainer/security/capabilities" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/daemon/execdriver/native/configuration" - "github.com/dotcloud/docker/daemon/execdriver/native/template" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver/native/configuration" + "github.com/docker/docker/daemon/execdriver/native/template" ) // createContainer populates and configures the container type with the diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 37c21d6f94..5ffc6a4488 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -20,9 +20,9 @@ import ( "github.com/docker/libcontainer/cgroups/systemd" "github.com/docker/libcontainer/namespaces" "github.com/docker/libcontainer/syncpipe" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/system" - "github.com/dotcloud/docker/pkg/term" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/pkg/system" + "github.com/docker/docker/pkg/term" ) const ( diff --git a/daemon/execdriver/native/driver_unsupported.go b/daemon/execdriver/native/driver_unsupported.go index 797b7d436f..97839cf3b2 100644 --- a/daemon/execdriver/native/driver_unsupported.go +++ b/daemon/execdriver/native/driver_unsupported.go @@ -5,7 +5,7 @@ package native import ( "fmt" - "github.com/dotcloud/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver" ) func NewDriver(root, initPath string) (execdriver.Driver, error) { diff --git a/daemon/execdriver/native/driver_unsupported_nocgo.go b/daemon/execdriver/native/driver_unsupported_nocgo.go index 9979099386..2b8e9f81a1 100644 --- a/daemon/execdriver/native/driver_unsupported_nocgo.go +++ b/daemon/execdriver/native/driver_unsupported_nocgo.go @@ -5,7 +5,7 @@ package native import ( "fmt" - "github.com/dotcloud/docker/daemon/execdriver" + "github.com/docker/docker/daemon/execdriver" ) func NewDriver(root, initPath string) (execdriver.Driver, error) { diff --git a/daemon/execdriver/utils.go b/daemon/execdriver/utils.go index 2fb431f17b..c1317fb833 100644 --- a/daemon/execdriver/utils.go +++ b/daemon/execdriver/utils.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/docker/libcontainer/security/capabilities" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) func TweakCapabilities(basics, adds, drops []string) ([]string, error) { diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index 0206b92e17..d1fa91d6d4 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -31,10 +31,10 @@ import ( "syscall" "github.com/docker/libcontainer/label" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/graphdriver" - mountpk "github.com/dotcloud/docker/pkg/mount" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/graphdriver" + mountpk "github.com/docker/docker/pkg/mount" + "github.com/docker/docker/utils" ) var ( diff --git a/daemon/graphdriver/aufs/aufs_test.go b/daemon/graphdriver/aufs/aufs_test.go index b3bad410a5..081fb88984 100644 --- a/daemon/graphdriver/aufs/aufs_test.go +++ b/daemon/graphdriver/aufs/aufs_test.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/graphdriver" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/graphdriver" "io/ioutil" "os" "path" diff --git a/daemon/graphdriver/aufs/mount.go b/daemon/graphdriver/aufs/mount.go index 1f1d98f809..5f8a026c57 100644 --- a/daemon/graphdriver/aufs/mount.go +++ b/daemon/graphdriver/aufs/mount.go @@ -1,7 +1,7 @@ package aufs import ( - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" "os/exec" "syscall" ) diff --git a/daemon/graphdriver/btrfs/btrfs.go b/daemon/graphdriver/btrfs/btrfs.go index f561244c51..afca72029f 100644 --- a/daemon/graphdriver/btrfs/btrfs.go +++ b/daemon/graphdriver/btrfs/btrfs.go @@ -16,8 +16,8 @@ import ( "syscall" "unsafe" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/mount" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/pkg/mount" ) func init() { diff --git a/daemon/graphdriver/btrfs/btrfs_test.go b/daemon/graphdriver/btrfs/btrfs_test.go index 3069a98557..cde23ce4a0 100644 --- a/daemon/graphdriver/btrfs/btrfs_test.go +++ b/daemon/graphdriver/btrfs/btrfs_test.go @@ -1,7 +1,7 @@ package btrfs import ( - "github.com/dotcloud/docker/daemon/graphdriver/graphtest" + "github.com/docker/docker/daemon/graphdriver/graphtest" "testing" ) diff --git a/daemon/graphdriver/devmapper/attach_loopback.go b/daemon/graphdriver/devmapper/attach_loopback.go index 28a648a5e1..8dc57f8b4b 100644 --- a/daemon/graphdriver/devmapper/attach_loopback.go +++ b/daemon/graphdriver/devmapper/attach_loopback.go @@ -7,7 +7,7 @@ import ( "os" "syscall" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) func stringToLoopName(src string) [LoNameSize]uint8 { diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 3c36a22cb8..518bef2180 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -19,9 +19,9 @@ import ( "time" "github.com/docker/libcontainer/label" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/units" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/pkg/units" + "github.com/docker/docker/utils" ) var ( diff --git a/daemon/graphdriver/devmapper/devmapper.go b/daemon/graphdriver/devmapper/devmapper.go index ee4f2a8159..ab327f61b9 100644 --- a/daemon/graphdriver/devmapper/devmapper.go +++ b/daemon/graphdriver/devmapper/devmapper.go @@ -9,7 +9,7 @@ import ( "runtime" "syscall" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) type DevmapperLogger interface { diff --git a/daemon/graphdriver/devmapper/devmapper_test.go b/daemon/graphdriver/devmapper/devmapper_test.go index 7c97d6bb04..4ed44cf729 100644 --- a/daemon/graphdriver/devmapper/devmapper_test.go +++ b/daemon/graphdriver/devmapper/devmapper_test.go @@ -3,7 +3,7 @@ package devmapper import ( - "github.com/dotcloud/docker/daemon/graphdriver/graphtest" + "github.com/docker/docker/daemon/graphdriver/graphtest" "testing" ) diff --git a/daemon/graphdriver/devmapper/driver.go b/daemon/graphdriver/devmapper/driver.go index 29335377f6..bbe3c92695 100644 --- a/daemon/graphdriver/devmapper/driver.go +++ b/daemon/graphdriver/devmapper/driver.go @@ -8,9 +8,9 @@ import ( "os" "path" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/pkg/mount" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/pkg/mount" + "github.com/docker/docker/utils" ) func init() { diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go index 4536489706..90ed1d8162 100644 --- a/daemon/graphdriver/driver.go +++ b/daemon/graphdriver/driver.go @@ -6,8 +6,8 @@ import ( "os" "path" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/pkg/mount" + "github.com/docker/docker/archive" + "github.com/docker/docker/pkg/mount" ) type FsMagic uint64 diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graphtest.go index a667f2afa6..6407e1205d 100644 --- a/daemon/graphdriver/graphtest/graphtest.go +++ b/daemon/graphdriver/graphtest/graphtest.go @@ -7,7 +7,7 @@ import ( "syscall" "testing" - "github.com/dotcloud/docker/daemon/graphdriver" + "github.com/docker/docker/daemon/graphdriver" ) var ( diff --git a/daemon/graphdriver/vfs/driver.go b/daemon/graphdriver/vfs/driver.go index 7eaa22461f..2ea6325a1e 100644 --- a/daemon/graphdriver/vfs/driver.go +++ b/daemon/graphdriver/vfs/driver.go @@ -3,7 +3,7 @@ package vfs import ( "bytes" "fmt" - "github.com/dotcloud/docker/daemon/graphdriver" + "github.com/docker/docker/daemon/graphdriver" "os" "os/exec" "path" diff --git a/daemon/graphdriver/vfs/vfs_test.go b/daemon/graphdriver/vfs/vfs_test.go index e79f93c91d..eaf70f59d3 100644 --- a/daemon/graphdriver/vfs/vfs_test.go +++ b/daemon/graphdriver/vfs/vfs_test.go @@ -1,7 +1,7 @@ package vfs import ( - "github.com/dotcloud/docker/daemon/graphdriver/graphtest" + "github.com/docker/docker/daemon/graphdriver/graphtest" "testing" ) diff --git a/daemon/inspect.go b/daemon/inspect.go index b93aec5059..373b43b8b6 100644 --- a/daemon/inspect.go +++ b/daemon/inspect.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/runconfig" + "github.com/docker/docker/engine" + "github.com/docker/docker/runconfig" ) func (daemon *Daemon) ContainerInspect(job *engine.Job) engine.Status { diff --git a/daemon/network_settings.go b/daemon/network_settings.go index a5c750acfe..bf28ca1b50 100644 --- a/daemon/network_settings.go +++ b/daemon/network_settings.go @@ -1,8 +1,8 @@ package daemon import ( - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/engine" + "github.com/docker/docker/nat" ) // FIXME: move deprecated port stuff to nat to clean up the core. diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go index beb01243f9..caedb7202a 100644 --- a/daemon/networkdriver/bridge/driver.go +++ b/daemon/networkdriver/bridge/driver.go @@ -9,14 +9,14 @@ import ( "sync" "github.com/docker/libcontainer/netlink" - "github.com/dotcloud/docker/daemon/networkdriver" - "github.com/dotcloud/docker/daemon/networkdriver/ipallocator" - "github.com/dotcloud/docker/daemon/networkdriver/portallocator" - "github.com/dotcloud/docker/daemon/networkdriver/portmapper" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/iptables" - "github.com/dotcloud/docker/pkg/networkfs/resolvconf" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon/networkdriver" + "github.com/docker/docker/daemon/networkdriver/ipallocator" + "github.com/docker/docker/daemon/networkdriver/portallocator" + "github.com/docker/docker/daemon/networkdriver/portmapper" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/iptables" + "github.com/docker/docker/pkg/networkfs/resolvconf" + "github.com/docker/docker/utils" ) const ( @@ -158,7 +158,7 @@ func InitDriver(job *engine.Job) engine.Status { bridgeNetwork = network - // https://github.com/dotcloud/docker/issues/2768 + // https://github.com/docker/docker/issues/2768 job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP) for name, f := range map[string]engine.Handler{ diff --git a/daemon/networkdriver/bridge/driver_test.go b/daemon/networkdriver/bridge/driver_test.go index f8ddd4c64e..bf44181266 100644 --- a/daemon/networkdriver/bridge/driver_test.go +++ b/daemon/networkdriver/bridge/driver_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/dotcloud/docker/engine" + "github.com/docker/docker/engine" ) func findFreePort(t *testing.T) int { diff --git a/daemon/networkdriver/ipallocator/allocator.go b/daemon/networkdriver/ipallocator/allocator.go index f154b0bd49..1bf8e1da9b 100644 --- a/daemon/networkdriver/ipallocator/allocator.go +++ b/daemon/networkdriver/ipallocator/allocator.go @@ -3,7 +3,7 @@ package ipallocator import ( "encoding/binary" "errors" - "github.com/dotcloud/docker/daemon/networkdriver" + "github.com/docker/docker/daemon/networkdriver" "net" "sync" ) diff --git a/daemon/networkdriver/portmapper/mapper.go b/daemon/networkdriver/portmapper/mapper.go index 1bd332271f..693cebbcea 100644 --- a/daemon/networkdriver/portmapper/mapper.go +++ b/daemon/networkdriver/portmapper/mapper.go @@ -6,9 +6,9 @@ import ( "net" "sync" - "github.com/dotcloud/docker/daemon/networkdriver/portallocator" - "github.com/dotcloud/docker/pkg/iptables" - "github.com/dotcloud/docker/pkg/proxy" + "github.com/docker/docker/daemon/networkdriver/portallocator" + "github.com/docker/docker/pkg/iptables" + "github.com/docker/docker/pkg/proxy" ) type mapping struct { diff --git a/daemon/networkdriver/portmapper/mapper_test.go b/daemon/networkdriver/portmapper/mapper_test.go index 6affdc5445..5e64e1571b 100644 --- a/daemon/networkdriver/portmapper/mapper_test.go +++ b/daemon/networkdriver/portmapper/mapper_test.go @@ -1,9 +1,9 @@ package portmapper import ( - "github.com/dotcloud/docker/daemon/networkdriver/portallocator" - "github.com/dotcloud/docker/pkg/iptables" - "github.com/dotcloud/docker/pkg/proxy" + "github.com/docker/docker/daemon/networkdriver/portallocator" + "github.com/docker/docker/pkg/iptables" + "github.com/docker/docker/pkg/proxy" "net" "testing" ) diff --git a/daemon/server.go b/daemon/server.go index dbe6a8ebe8..1e06eda896 100644 --- a/daemon/server.go +++ b/daemon/server.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) type Server interface { diff --git a/daemon/state.go b/daemon/state.go index 3f904d7829..e500d735e3 100644 --- a/daemon/state.go +++ b/daemon/state.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/dotcloud/docker/pkg/units" + "github.com/docker/docker/pkg/units" ) type State struct { diff --git a/daemon/utils.go b/daemon/utils.go index d60d985152..053319c5ea 100644 --- a/daemon/utils.go +++ b/daemon/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/runconfig" + "github.com/docker/docker/nat" + "github.com/docker/docker/runconfig" ) func migratePortMappings(config *runconfig.Config, hostConfig *runconfig.HostConfig) error { diff --git a/daemon/utils_test.go b/daemon/utils_test.go index 22b52d1699..1f3175b994 100644 --- a/daemon/utils_test.go +++ b/daemon/utils_test.go @@ -3,8 +3,8 @@ package daemon import ( "testing" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" ) func TestMergeLxcConfig(t *testing.T) { diff --git a/daemon/volumes.go b/daemon/volumes.go index 98a1913288..2eee7789b9 100644 --- a/daemon/volumes.go +++ b/daemon/volumes.go @@ -8,9 +8,9 @@ import ( "strings" "syscall" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/execdriver" - "github.com/dotcloud/docker/pkg/symlink" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/execdriver" + "github.com/docker/docker/pkg/symlink" ) type BindMap struct { diff --git a/daemonconfig/config.go b/daemonconfig/config.go index 1d2bb60dd6..c46f1853ba 100644 --- a/daemonconfig/config.go +++ b/daemonconfig/config.go @@ -1,8 +1,8 @@ package daemonconfig import ( - "github.com/dotcloud/docker/daemon/networkdriver" - "github.com/dotcloud/docker/engine" + "github.com/docker/docker/daemon/networkdriver" + "github.com/docker/docker/engine" "net" ) diff --git a/docker/docker.go b/docker/docker.go index f9f8e6da10..1ace730d48 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -12,15 +12,15 @@ import ( "runtime" "strings" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/api/client" - "github.com/dotcloud/docker/builtins" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/opts" - flag "github.com/dotcloud/docker/pkg/mflag" - "github.com/dotcloud/docker/sysinit" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api" + "github.com/docker/docker/api/client" + "github.com/docker/docker/builtins" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/opts" + flag "github.com/docker/docker/pkg/mflag" + "github.com/docker/docker/sysinit" + "github.com/docker/docker/utils" ) const ( @@ -154,7 +154,7 @@ func main() { 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 { job := eng.Job("initserverpidfile", *pidfile) 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" // without actually causing a kernel panic, so we need this workaround until // 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 { log.Printf("WARNING: %s\n", err) } else { diff --git a/dockerinit/dockerinit.go b/dockerinit/dockerinit.go index 1d0689387a..3507d3e5fe 100644 --- a/dockerinit/dockerinit.go +++ b/dockerinit/dockerinit.go @@ -1,7 +1,7 @@ package main import ( - "github.com/dotcloud/docker/sysinit" + "github.com/docker/docker/sysinit" ) func main() { diff --git a/docs/Dockerfile b/docs/Dockerfile index 345de92bd0..03953989a3 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -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 MAINTAINER Sven Dowideit (@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/\$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 CMD ["mkdocs", "serve"] diff --git a/docs/README.md b/docs/README.md index 17299401e7..ba1feb50d4 100755 --- a/docs/README.md +++ b/docs/README.md @@ -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 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 development) branch maps to the "master" documentation. diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index b75e198906..389f05720d 100755 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -6,7 +6,7 @@ site_favicon: img/favicon.png dev_addr: '0.0.0.0:8000' -repo_url: https://github.com/dotcloud/docker/ +repo_url: https://github.com/docker/docker/ docs_dir: sources diff --git a/docs/sources/articles/baseimages.md b/docs/sources/articles/baseimages.md index d2adf62a12..bc677eb8a3 100644 --- a/docs/sources/articles/baseimages.md +++ b/docs/sources/articles/baseimages.md @@ -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 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]( - 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.]( - https://github.com/dotcloud/docker/blob/master/contrib/mkimage-yum.sh) + https://github.com/docker/docker/blob/master/contrib/mkimage-yum.sh) - [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` diff --git a/docs/sources/articles/networking.md b/docs/sources/articles/networking.md index bf46b90ea2..ff1a8ae75d 100644 --- a/docs/sources/articles/networking.md +++ b/docs/sources/articles/networking.md @@ -539,7 +539,7 @@ values. It also allows the container to access local network services like D-bus. This can lead to processes in the container being 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. * `--net=container:NAME_or_ID` — Tells Docker to put this container's diff --git a/docs/sources/articles/security.md b/docs/sources/articles/security.md index dcc61f386c..12f7b350ec 100644 --- a/docs/sources/articles/security.md +++ b/docs/sources/articles/security.md @@ -196,7 +196,7 @@ to the host. This won't affect regular web apps; but malicious users will find that the arsenal at their disposal has shrunk considerably! By default Docker 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 available capabilities in [Linux 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 them (for instance, if you want to use a FUSE-based filesystem), but by 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. ## Other Kernel Security Features diff --git a/docs/sources/contributing/contributing.md b/docs/sources/contributing/contributing.md index dd764eb855..7d65a0479c 100644 --- a/docs/sources/contributing/contributing.md +++ b/docs/sources/contributing/contributing.md @@ -7,18 +7,18 @@ page_keywords: contributing, docker, documentation, help, guideline Want to hack on Docker? Awesome! 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]( -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. 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]( -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. 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). diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md index 606f9302fc..25a80af4af 100644 --- a/docs/sources/contributing/devenvironment.md +++ b/docs/sources/contributing/devenvironment.md @@ -32,7 +32,7 @@ Again, you can do it in other ways but you need to do more work. ## Check out the Source - $ git clone https://git@github.com/dotcloud/docker + $ git clone https://git@github.com/docker/docker $ cd docker To checkout a different revision just use `git checkout` @@ -110,7 +110,7 @@ something like this === RUN TestDependencyGraph --- PASS: TestDependencyGraph (0.00 seconds) 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 to `go test`. You can use this to select certain tests to run, e.g., diff --git a/docs/sources/docker-hub/repos.md b/docs/sources/docker-hub/repos.md index c219a1989a..3fa901cfbb 100644 --- a/docs/sources/docker-hub/repos.md +++ b/docs/sources/docker-hub/repos.md @@ -65,7 +65,7 @@ optimized and up-to-date image to power your applications. > **Note:** > If you would like to contribute an official repository for your > organization, product or team you can see more information -> [here](https://github.com/dotcloud/stackbrew). +> [here](https://github.com/docker/stackbrew). ## Private Docker Repositories diff --git a/docs/sources/examples/running_riak_service.md b/docs/sources/examples/running_riak_service.md index d9f2c42850..d65422b524 100644 --- a/docs/sources/examples/running_riak_service.md +++ b/docs/sources/examples/running_riak_service.md @@ -74,7 +74,7 @@ Almost there. Next, we add a hack to get us by the lack of `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 ln -s /bin/true /sbin/initctl diff --git a/docs/sources/faq.md b/docs/sources/faq.md index 667058c86f..d903aabf86 100644 --- a/docs/sources/faq.md +++ b/docs/sources/faq.md @@ -14,8 +14,8 @@ paying. ### What open source license are you using? We are using the Apache License Version 2.0, see it here: -[https://github.com/dotcloud/docker/blob/master/LICENSE]( -https://github.com/dotcloud/docker/blob/master/LICENSE) +[https://github.com/docker/docker/blob/master/LICENSE]( +https://github.com/docker/docker/blob/master/LICENSE) ### 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? -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. ### 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 developer mailinglist](https://groups.google.com/d/forum/docker-dev) - [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) - [Join the conversation on Twitter](http://twitter.com/docker) diff --git a/docs/sources/index.md b/docs/sources/index.md index 75414b4364..5267557f38 100644 --- a/docs/sources/index.md +++ b/docs/sources/index.md @@ -94,7 +94,7 @@ To learn about Docker in more detail and to answer questions about usage and imp *`.dockerignore` support* You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will ignore files and directories specified in that file when sending the build context to the daemon. -Example: https://github.com/dotcloud/docker/blob/master/.dockerignore +Example: https://github.com/docker/docker/blob/master/.dockerignore *Pause containers during commit* diff --git a/docs/sources/installation/binaries.md b/docs/sources/installation/binaries.md index f6eb44fa64..8e35d98030 100644 --- a/docs/sources/installation/binaries.md +++ b/docs/sources/installation/binaries.md @@ -23,9 +23,9 @@ runtime: - a [properly mounted]( https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount) cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount - point [is](https://github.com/dotcloud/docker/issues/2683) - [not](https://github.com/dotcloud/docker/issues/3485) - [sufficient](https://github.com/dotcloud/docker/issues/4568)) + point [is](https://github.com/docker/docker/issues/2683) + [not](https://github.com/docker/docker/issues/3485) + [sufficient](https://github.com/docker/docker/issues/4568)) ## Check kernel dependencies diff --git a/docs/sources/reference/api/docker-io_api.md b/docs/sources/reference/api/docker-io_api.md index d5be332d35..e34e43f3bf 100644 --- a/docs/sources/reference/api/docker-io_api.md +++ b/docs/sources/reference/api/docker-io_api.md @@ -421,7 +421,7 @@ Registering a new account. Accept: application/json Content-Type: application/json - {"email": "sam@dotcloud.com", + {"email": "sam@docker.com", "password": "toto42", "username": "foobar"} @@ -468,7 +468,7 @@ Change a password or email address for given user. If you pass in an Content-Type: application/json Authorization: Basic akmklmasadalkm== - {"email": "sam@dotcloud.com", + {"email": "sam@docker.com", "password": "toto42"} Parameters: diff --git a/docs/sources/reference/api/docker_remote_api.md b/docs/sources/reference/api/docker_remote_api.md index a5bf3d577b..4248d3c38b 100644 --- a/docs/sources/reference/api/docker_remote_api.md +++ b/docs/sources/reference/api/docker_remote_api.md @@ -374,7 +374,7 @@ Image's name added in the events ## v1.3 docker v0.5.0 -[51f6c4a](https://github.com/dotcloud/docker/commit/51f6c4a7372450d164c61e0054daf0223ddbd909) +[51f6c4a](https://github.com/docker/docker/commit/51f6c4a7372450d164c61e0054daf0223ddbd909) ### Full Documentation @@ -414,7 +414,7 @@ Start containers (/containers//start): ## v1.2 docker v0.4.2 -[2e7649b](https://github.com/dotcloud/docker/commit/2e7649beda7c820793bd46766cbc2cfeace7b168) +[2e7649b](https://github.com/docker/docker/commit/2e7649beda7c820793bd46766cbc2cfeace7b168) ### Full Documentation @@ -446,7 +446,7 @@ deleted/untagged. ## v1.1 docker v0.4.0 -[a8ae398](https://github.com/dotcloud/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f) +[a8ae398](https://github.com/docker/docker/commit/a8ae398bf52e97148ee7bd0d5868de2e15bd297f) ### Full Documentation @@ -473,7 +473,7 @@ Uses json stream instead of HTML hijack, it looks like this: ## v1.0 docker v0.3.4 -[8d73740](https://github.com/dotcloud/docker/commit/8d73740343778651c09160cde9661f5f387b36f4) +[8d73740](https://github.com/docker/docker/commit/8d73740343778651c09160cde9661f5f387b36f4) ### Full Documentation diff --git a/docs/sources/reference/api/docker_remote_api_v1.0.md b/docs/sources/reference/api/docker_remote_api_v1.0.md index b906298b85..c9f2cd855d 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.0.md +++ b/docs/sources/reference/api/docker_remote_api_v1.0.md @@ -194,7 +194,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.1.md b/docs/sources/reference/api/docker_remote_api_v1.1.md index 4e449bccec..6bd077a665 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.1.md +++ b/docs/sources/reference/api/docker_remote_api_v1.1.md @@ -194,7 +194,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.10.md b/docs/sources/reference/api/docker_remote_api_v1.10.md index 264cdefc20..ff0e972dd2 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.10.md +++ b/docs/sources/reference/api/docker_remote_api_v1.10.md @@ -220,7 +220,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.11.md b/docs/sources/reference/api/docker_remote_api_v1.11.md index ae2daae407..3e777f6f7a 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.11.md +++ b/docs/sources/reference/api/docker_remote_api_v1.11.md @@ -224,7 +224,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.12.md b/docs/sources/reference/api/docker_remote_api_v1.12.md index 19fb24fe48..c0143aec6b 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.12.md +++ b/docs/sources/reference/api/docker_remote_api_v1.12.md @@ -224,7 +224,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.13.md b/docs/sources/reference/api/docker_remote_api_v1.13.md index 1cbf43f4ce..f6d8c9b46b 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.13.md +++ b/docs/sources/reference/api/docker_remote_api_v1.13.md @@ -224,7 +224,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.14.md b/docs/sources/reference/api/docker_remote_api_v1.14.md index ce876594c5..06c36e093b 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.14.md +++ b/docs/sources/reference/api/docker_remote_api_v1.14.md @@ -224,7 +224,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.2.md b/docs/sources/reference/api/docker_remote_api_v1.2.md index 37a8e1c012..1fdaa18f4d 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.2.md +++ b/docs/sources/reference/api/docker_remote_api_v1.2.md @@ -206,7 +206,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.3.md b/docs/sources/reference/api/docker_remote_api_v1.3.md index b510f660fd..d58bbc0f18 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.3.md +++ b/docs/sources/reference/api/docker_remote_api_v1.3.md @@ -208,7 +208,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.4.md b/docs/sources/reference/api/docker_remote_api_v1.4.md index 0e49402621..42bb2e862e 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.4.md +++ b/docs/sources/reference/api/docker_remote_api_v1.4.md @@ -213,7 +213,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.5.md b/docs/sources/reference/api/docker_remote_api_v1.5.md index 33c1aeca1e..5ccdca0e25 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.5.md +++ b/docs/sources/reference/api/docker_remote_api_v1.5.md @@ -211,7 +211,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.6.md b/docs/sources/reference/api/docker_remote_api_v1.6.md index 4500c1554c..b0ecd50962 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.6.md +++ b/docs/sources/reference/api/docker_remote_api_v1.6.md @@ -261,7 +261,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.7.md b/docs/sources/reference/api/docker_remote_api_v1.7.md index 402efa4262..cb2131bb8a 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.7.md +++ b/docs/sources/reference/api/docker_remote_api_v1.7.md @@ -217,7 +217,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.8.md b/docs/sources/reference/api/docker_remote_api_v1.8.md index 78fccaf281..305ce4709a 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.8.md +++ b/docs/sources/reference/api/docker_remote_api_v1.8.md @@ -237,7 +237,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/docker_remote_api_v1.9.md b/docs/sources/reference/api/docker_remote_api_v1.9.md index 741a9ac955..36a3e109b0 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.9.md +++ b/docs/sources/reference/api/docker_remote_api_v1.9.md @@ -237,7 +237,7 @@ Return low-level information on the container `id` "Bridge": "", "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", "Volumes": {}, "HostConfig": { diff --git a/docs/sources/reference/api/hub_registry_spec.md b/docs/sources/reference/api/hub_registry_spec.md index 1a2cf9423d..b2d29ab4af 100644 --- a/docs/sources/reference/api/hub_registry_spec.md +++ b/docs/sources/reference/api/hub_registry_spec.md @@ -35,7 +35,7 @@ managed by Docker Inc. service using tokens - It supports different storage backends (S3, cloud files, local FS) - It doesn't have a local database - - [Source Code](https://github.com/dotcloud/docker-registry) + - [Source Code](https://github.com/docker/docker-registry) We expect that there will be multiple registries out there. To help to grasp the context, here are some examples of registries: @@ -479,7 +479,7 @@ file is empty. POST /v1/users: **Body**: - {"email": "[sam@dotcloud.com](mailto:sam%40dotcloud.com)", + {"email": "[sam@docker.com](mailto:sam%40docker.com)", "password": "toto42", "username": "foobar"`} **Validation**: diff --git a/docs/sources/reference/builder.md b/docs/sources/reference/builder.md index 57ddb52984..680fe2642f 100644 --- a/docs/sources/reference/builder.md +++ b/docs/sources/reference/builder.md @@ -175,7 +175,7 @@ The cache for `RUN` instructions can be invalidated by `ADD` instructions. See ### Known Issues (RUN) -- [Issue 783](https://github.com/dotcloud/docker/issues/783) is about file +- [Issue 783](https://github.com/docker/docker/issues/783) is about file permissions problems that can occur when using the AUFS file system. You might notice it during an attempt to `rm` a file, for example. The issue describes a workaround. diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 8b03531fc8..9a5ace4716 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -117,7 +117,7 @@ you can also specify individual sockets too `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/dotcloud/docker/blob/master/contrib/init/systemd/socket-activation/). +https://github.com/docker/docker/blob/master/contrib/init/systemd/socket-activation/). Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and for `/tmp`. TMPDIR and the data directory can be set @@ -396,9 +396,9 @@ For example: A /go A /go/src A /go/src/github.com - A /go/src/github.com/dotcloud - A /go/src/github.com/dotcloud/docker - A /go/src/github.com/dotcloud/docker/.git + A /go/src/github.com/docker + A /go/src/github.com/docker/docker + A /go/src/github.com/docker/docker/.git .... ## events @@ -871,7 +871,7 @@ registry or to a self-hosted one. ### Known Issues (rm) -- [Issue 197](https://github.com/dotcloud/docker/issues/197) indicates +- [Issue 197](https://github.com/docker/docker/issues/197) indicates that `docker kill` may leave directories behind and make it difficult to remove the container. @@ -1008,7 +1008,7 @@ and linking containers. ### Known Issues (run –volumes-from) -- [Issue 2702](https://github.com/dotcloud/docker/issues/2702): +- [Issue 2702](https://github.com/docker/docker/issues/2702): "lxc-start: Permission denied - failed to mount" could indicate a permissions problem with AppArmor. Please see the issue for a workaround. diff --git a/docs/sources/reference/run.md b/docs/sources/reference/run.md index 903d750d74..a933a32bea 100644 --- a/docs/sources/reference/run.md +++ b/docs/sources/reference/run.md @@ -86,7 +86,7 @@ and pass along signals. All of that is configurable: -i=false : Keep STDIN open even if not attached If you do not specify `-a` then Docker will [attach all standard -streams]( https://github.com/dotcloud/docker/blob/ +streams]( https://github.com/docker/docker/blob/ 75a7f4d90cde0295bcfb7213004abce8d4779b75/commands.go#L1797). You can specify to which of the three standard streams (`STDIN`, `STDOUT`, `STDERR`) you'd like to connect instead, as in: @@ -237,7 +237,7 @@ By default, Docker containers are "unprivileged" and cannot, for example, run a Docker daemon inside a Docker container. This is because by default a container is not allowed to access any devices, but a "privileged" container is given access to all devices (see [lxc-template.go]( -https://github.com/dotcloud/docker/blob/master/daemon/execdriver/lxc/lxc_template.go) +https://github.com/docker/docker/blob/master/daemon/execdriver/lxc/lxc_template.go) and documentation on [cgroups devices]( https://www.kernel.org/doc/Documentation/cgroups/devices.txt)). @@ -262,7 +262,7 @@ If the Docker daemon was started using the `lxc` exec-driver (`docker -d --exec-driver=lxc`) then the operator can also specify LXC options using one or more `--lxc-conf` parameters. These can be new parameters or override existing parameters from the [lxc-template.go]( -https://github.com/dotcloud/docker/blob/master/daemon/execdriver/lxc/lxc_template.go). +https://github.com/docker/docker/blob/master/daemon/execdriver/lxc/lxc_template.go). Note that in the future, a given host's docker daemon may not use LXC, so this is an implementation-specific configuration meant for operators already familiar with using LXC directly. diff --git a/docs/sources/userguide/dockerimages.md b/docs/sources/userguide/dockerimages.md index 26f969abe8..4b3ac7c519 100644 --- a/docs/sources/userguide/dockerimages.md +++ b/docs/sources/userguide/dockerimages.md @@ -130,7 +130,7 @@ We can see we've returned a lot of images that use the term `sinatra`. We've returned a list of image names, descriptions, Stars (which measure the social popularity of images - if a user likes an image then they can "star" it), and the Official and Automated build statuses. Official repositories are built and -maintained by the [Stackbrew](https://github.com/dotcloud/stackbrew) project, +maintained by the [Stackbrew](https://github.com/docker/stackbrew) project, and Automated repositories are [Automated Builds]( /userguide/dockerrepos/#automated-builds) that allow you to validate the source and content of an image. diff --git a/docs/sources/userguide/index.md b/docs/sources/userguide/index.md index eef59c000b..08d6be0731 100644 --- a/docs/sources/userguide/index.md +++ b/docs/sources/userguide/index.md @@ -87,7 +87,7 @@ Go to [Working with Docker Hub](/userguide/dockerrepos). * [Docker blog](http://blog.docker.com/) * [Docker documentation](http://docs.docker.com/) * [Docker Getting Started Guide](http://www.docker.com/gettingstarted/) -* [Docker code on GitHub](https://github.com/dotcloud/docker) +* [Docker code on GitHub](https://github.com/docker/docker) * [Docker mailing list](https://groups.google.com/forum/#!forum/docker-user) * Docker on IRC: irc.freenode.net and channel #docker diff --git a/docs/theme/mkdocs/base.html b/docs/theme/mkdocs/base.html index 2b2b9bcbcf..3fe284689b 100644 --- a/docs/theme/mkdocs/base.html +++ b/docs/theme/mkdocs/base.html @@ -61,7 +61,7 @@ diff --git a/docs/theme/mkdocs/breadcrumbs.html b/docs/theme/mkdocs/breadcrumbs.html index 3dc2dbbafb..c99e10f3aa 100644 --- a/docs/theme/mkdocs/breadcrumbs.html +++ b/docs/theme/mkdocs/breadcrumbs.html @@ -8,5 +8,5 @@ {% endif %} {% endif %} {% endfor %} -
  • Edit on GitHub
    • +
  • Edit on GitHub
    • \ No newline at end of file diff --git a/docs/theme/mkdocs/footer.html b/docs/theme/mkdocs/footer.html index 0b887b82d0..fbe0c88ef3 100644 --- a/docs/theme/mkdocs/footer.html +++ b/docs/theme/mkdocs/footer.html @@ -10,7 +10,7 @@
  • Governance
  • Forums
  • IRC
    • -
  • GitHub
    • +
  • GitHub
  • Stackoverflow
  • Swag
    • diff --git a/engine/engine.go b/engine/engine.go index 5c3228d5d3..0008d605d0 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) // Installer is a standard interface for objects which can "install" themselves diff --git a/engine/env_test.go b/engine/env_test.go index f76d879114..fe1db04e33 100644 --- a/engine/env_test.go +++ b/engine/env_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/dotcloud/docker/pkg/testutils" + "github.com/docker/docker/pkg/testutils" ) func TestEnvLenZero(t *testing.T) { diff --git a/graph/graph.go b/graph/graph.go index 0badd8dcde..e8b52331e2 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -12,13 +12,13 @@ import ( "syscall" "time" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/pkg/truncindex" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/image" + "github.com/docker/docker/pkg/truncindex" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" ) // A Graph is a store for versioned filesystem images and the relationship between them. diff --git a/graph/service.go b/graph/service.go index 3201d6b994..82fee68670 100644 --- a/graph/service.go +++ b/graph/service.go @@ -3,9 +3,9 @@ package graph import ( "io" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/engine" + "github.com/docker/docker/image" + "github.com/docker/docker/utils" ) func (s *TagStore) Install(eng *engine.Engine) error { diff --git a/graph/tags.go b/graph/tags.go index 7af6d383d8..343cccf31f 100644 --- a/graph/tags.go +++ b/graph/tags.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/image" + "github.com/docker/docker/utils" ) const DEFAULTTAG = "latest" diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go index 42e097724d..fdcc21ecbe 100644 --- a/graph/tags_unit_test.go +++ b/graph/tags_unit_test.go @@ -2,11 +2,11 @@ package graph import ( "bytes" - "github.com/dotcloud/docker/daemon/graphdriver" - _ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/docker/docker/daemon/graphdriver" + _ "github.com/docker/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests + "github.com/docker/docker/image" + "github.com/docker/docker/utils" + "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io" "os" "path" diff --git a/hack/PACKAGERS.md b/hack/PACKAGERS.md index 4312d5d3c0..6a22f4fc97 100644 --- a/hack/PACKAGERS.md +++ b/hack/PACKAGERS.md @@ -48,7 +48,7 @@ To build Docker, you will need the following: * Go version 1.2 or later * A clean checkout of the source added to a valid [Go workspace](http://golang.org/doc/code.html#Workspaces) under the path - *src/github.com/dotcloud/docker* (unless you plan to use `AUTO_GOPATH`, + *src/github.com/docker/docker* (unless you plan to use `AUTO_GOPATH`, explained in more detail below). To build the Docker daemon, you will additionally need: @@ -145,7 +145,7 @@ export AUTO_GOPATH=1 ``` This will cause the build scripts to set up a reasonable `GOPATH` that -automatically and properly includes both dotcloud/docker from the local +automatically and properly includes both docker/docker from the local directory, and the local "./vendor" directory as necessary. ### `DOCKER_BUILDTAGS` @@ -271,9 +271,9 @@ installed and available at runtime: * a [properly mounted](https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount) cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount point - [is](https://github.com/dotcloud/docker/issues/2683) - [not](https://github.com/dotcloud/docker/issues/3485) - [sufficient](https://github.com/dotcloud/docker/issues/4568)) + [is](https://github.com/docker/docker/issues/2683) + [not](https://github.com/docker/docker/issues/3485) + [sufficient](https://github.com/docker/docker/issues/4568)) Additionally, the Docker client needs the following software to be installed and available at runtime: diff --git a/hack/RELEASE-CHECKLIST.md b/hack/RELEASE-CHECKLIST.md index ccdcaee020..839f5c18fd 100644 --- a/hack/RELEASE-CHECKLIST.md +++ b/hack/RELEASE-CHECKLIST.md @@ -7,7 +7,7 @@ If your experience deviates from this document, please document the changes to keep it up-to-date. It is important to note that this document assumes that the git remote in your -repository that corresponds to "https://github.com/dotcloud/docker" is named +repository that corresponds to "https://github.com/docker/docker" is named "origin". If yours is not (for example, if you've chosen to name it "upstream" or something similar instead), be sure to adjust the listed snippets for your local environment accordingly. If you are not sure what your upstream remote is @@ -18,7 +18,7 @@ like: ```bash export GITHUBUSER="YOUR_GITHUB_USER" -git remote add origin https://github.com/dotcloud/docker.git +git remote add origin https://github.com/docker/docker.git git remote add $GITHUBUSER git@github.com:$GITHUBUSER/docker.git ``` @@ -155,7 +155,7 @@ make AWS_S3_BUCKET=beta-docs.docker.io BUILD_ROOT=yes docs-release git add VERSION CHANGELOG.md git commit -m "Bump version to $VERSION" git push $GITHUBUSER bump_$VERSION -echo "https://github.com/$GITHUBUSER/docker/compare/dotcloud:release...$GITHUBUSER:bump_$VERSION?expand=1" +echo "https://github.com/$GITHUBUSER/docker/compare/docker:release...$GITHUBUSER:bump_$VERSION?expand=1" ``` That last command will give you the proper link to visit to ensure that you @@ -288,7 +288,7 @@ echo ${VERSION#v}-dev > VERSION git add VERSION git commit -m "Change version to $(cat VERSION)" git push $GITHUBUSER merge_release_$VERSION -echo "https://github.com/$GITHUBUSER/docker/compare/dotcloud:master...$GITHUBUSER:merge_release_$VERSION?expand=1" +echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:merge_release_$VERSION?expand=1" ``` Again, get two maintainers to validate, then merge, then push that pretty diff --git a/hack/ROADMAP.md b/hack/ROADMAP.md index ff797b380c..d49664b7b3 100644 --- a/hack/ROADMAP.md +++ b/hack/ROADMAP.md @@ -3,7 +3,7 @@ This document is a high-level overview of where we want to take Docker next. It is a curated selection of planned improvements which are either important, difficult, or both. -For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/dotcloud/docker/issues). +For a more complete view of planned and requested improvements, see [the Github issues](https://github.com/docker/docker/issues). To suggest changes to the roadmap, including additions, please write the change as if it were already in effect, and make a pull request. diff --git a/hack/dind b/hack/dind index 77629ad0a5..f8fae6379c 100755 --- a/hack/dind +++ b/hack/dind @@ -2,7 +2,7 @@ set -e # DinD: a wrapper script which allows docker to be run inside a docker container. -# Original version by Jerome Petazzoni +# Original version by Jerome Petazzoni # See the blog post: http://blog.docker.com/2013/09/docker-can-now-run-within-docker/ # # This script should be executed inside a docker container in privilieged mode diff --git a/hack/make.sh b/hack/make.sh index d5bcfcfbc0..843c84b1f4 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -6,7 +6,7 @@ set -e # # Requirements: # - The current directory should be a checkout of the docker source code -# (http://github.com/dotcloud/docker). Whatever version is checked out +# (http://github.com/docker/docker). Whatever version is checked out # will be built. # - The VERSION file, at the root of the repository, should exist, and # will be used as Docker binary version and package version. @@ -25,7 +25,7 @@ set -o pipefail # We're a nice, sexy, little shell script, and people might try to run us; # but really, they shouldn't. We want to be in a container! -if [ "$(pwd)" != '/go/src/github.com/dotcloud/docker' ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then +if [ "$(pwd)" != '/go/src/github.com/docker/docker' ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then { echo "# WARNING! I don't seem to be running in the Docker container." echo "# The result of this command might be an incorrect build, and will not be" @@ -77,8 +77,8 @@ fi if [ "$AUTO_GOPATH" ]; then rm -rf .gopath - mkdir -p .gopath/src/github.com/dotcloud - ln -sf ../../../.. .gopath/src/github.com/dotcloud/docker + mkdir -p .gopath/src/github.com/docker + ln -sf ../../../.. .gopath/src/github.com/docker/docker export GOPATH="$(pwd)/.gopath:$(pwd)/vendor" fi @@ -91,8 +91,8 @@ fi # Use these flags when compiling the tests and final binary LDFLAGS=' -w - -X github.com/dotcloud/docker/dockerversion.GITCOMMIT "'$GITCOMMIT'" - -X github.com/dotcloud/docker/dockerversion.VERSION "'$VERSION'" + -X github.com/docker/docker/dockerversion.GITCOMMIT "'$GITCOMMIT'" + -X github.com/docker/docker/dockerversion.VERSION "'$VERSION'" ' LDFLAGS_STATIC='-linkmode external' EXTLDFLAGS_STATIC='-static' @@ -103,7 +103,7 @@ BUILDFLAGS=( -a -tags "netgo static_build $DOCKER_BUILDTAGS" ) EXTLDFLAGS_STATIC_DOCKER="$EXTLDFLAGS_STATIC -lpthread -Wl,--unresolved-symbols=ignore-in-object-files" LDFLAGS_STATIC_DOCKER=" $LDFLAGS_STATIC - -X github.com/dotcloud/docker/dockerversion.IAMSTATIC true + -X github.com/docker/docker/dockerversion.IAMSTATIC true -extldflags \"$EXTLDFLAGS_STATIC_DOCKER\" " @@ -150,7 +150,7 @@ go_test_dir() { testcover=( -cover -coverprofile "$coverprofile" $coverpkg ) fi ( - echo '+ go test' $TESTFLAGS "github.com/dotcloud/docker${dir#.}" + echo '+ go test' $TESTFLAGS "github.com/docker/docker${dir#.}" cd "$dir" go test ${testcover[@]} -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS ) diff --git a/hack/make/.ensure-scratch b/hack/make/.ensure-scratch index 487e85ae27..9a9a43a0f8 100644 --- a/hack/make/.ensure-scratch +++ b/hack/make/.ensure-scratch @@ -2,8 +2,8 @@ if ! docker inspect scratch &> /dev/null; then # let's build a "docker save" tarball for "scratch" - # see https://github.com/dotcloud/docker/pull/5262 - # and also https://github.com/dotcloud/docker/issues/4242 + # see https://github.com/docker/docker/pull/5262 + # and also https://github.com/docker/docker/issues/4242 mkdir -p /docker-scratch ( cd /docker-scratch diff --git a/hack/make/.validate b/hack/make/.validate index cf6be53a68..022809154e 100644 --- a/hack/make/.validate +++ b/hack/make/.validate @@ -4,7 +4,7 @@ if [ -z "$VALIDATE_UPSTREAM" ]; then # this is kind of an expensive check, so let's not do this twice if we # are running more than one validate bundlescript - VALIDATE_REPO='https://github.com/dotcloud/docker.git' + VALIDATE_REPO='https://github.com/docker/docker.git' VALIDATE_BRANCH='master' if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then diff --git a/hack/make/dynbinary b/hack/make/dynbinary index 74bb0dd36e..ca7cbdab07 100644 --- a/hack/make/dynbinary +++ b/hack/make/dynbinary @@ -39,7 +39,7 @@ fi # exported so that "dyntest" can easily access it later without recalculating it ( - export LDFLAGS_STATIC_DOCKER="-X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X github.com/dotcloud/docker/dockerversion.INITPATH \"$DOCKER_INITPATH\"" + export LDFLAGS_STATIC_DOCKER="-X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X github.com/docker/docker/dockerversion.INITPATH \"$DOCKER_INITPATH\"" export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary source "$(dirname "$BASH_SOURCE")/binary" ) diff --git a/hack/make/dyntest-integration b/hack/make/dyntest-integration index 03d7cbef95..218b65a054 100644 --- a/hack/make/dyntest-integration +++ b/hack/make/dyntest-integration @@ -12,7 +12,7 @@ fi ( export TEST_DOCKERINIT_PATH="$INIT" export LDFLAGS_STATIC_DOCKER=" - -X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" + -X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" " source "$(dirname "$BASH_SOURCE")/test-integration" ) diff --git a/hack/make/dyntest-unit b/hack/make/dyntest-unit index ce934f1849..dfd84cb3b5 100644 --- a/hack/make/dyntest-unit +++ b/hack/make/dyntest-unit @@ -12,7 +12,7 @@ fi ( export TEST_DOCKERINIT_PATH="$INIT" export LDFLAGS_STATIC_DOCKER=" - -X github.com/dotcloud/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" + -X github.com/docker/docker/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" " source "$(dirname "$BASH_SOURCE")/test-unit" ) diff --git a/hack/make/test-integration b/hack/make/test-integration index baad1349a2..9daa8a0a4e 100644 --- a/hack/make/test-integration +++ b/hack/make/test-integration @@ -5,7 +5,7 @@ DEST=$1 bundle_test_integration() { LDFLAGS="$LDFLAGS $LDFLAGS_STATIC_DOCKER" go_test_dir ./integration \ - "-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/dotcloud/docker,g' | paste -d, -s)" + "-coverpkg $(find_dirs '*.go' | sed 's,^\.,github.com/docker/docker,g' | paste -d, -s)" } # this "grep" hides some really irritating warnings that "go test -coverpkg" diff --git a/hack/make/validate-dco b/hack/make/validate-dco index 8b7812982d..8f3bfc317a 100644 --- a/hack/make/validate-dco +++ b/hack/make/validate-dco @@ -12,7 +12,7 @@ notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')" # "Username may only contain alphanumeric characters or dashes and cannot begin with a dash" githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+' -# https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md#sign-your-work +# https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work dcoPrefix='Docker-DCO-1.1-Signed-off-by:' dcoRegex="^$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)> \\(github: ($githubUsernameRegex)\\)$" @@ -48,7 +48,7 @@ else echo 'Please amend each commit to include a properly formatted DCO marker.' echo echo 'Visit the following URL for information about the Docker DCO:' - echo ' https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md#sign-your-work' + echo ' https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work' echo } >&2 false diff --git a/hack/release.sh b/hack/release.sh index 2a6b3992ef..2224e0619b 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -41,8 +41,8 @@ EOF [ "$AWS_ACCESS_KEY" ] || usage [ "$AWS_SECRET_KEY" ] || usage [ "$GPG_PASSPHRASE" ] || usage -[ -d /go/src/github.com/dotcloud/docker ] || usage -cd /go/src/github.com/dotcloud/docker +[ -d /go/src/github.com/docker/docker ] || usage +cd /go/src/github.com/docker/docker [ -x hack/make.sh ] || usage RELEASE_BUNDLES=( @@ -357,7 +357,7 @@ Key-Type: RSA Key-Length: 4096 Passphrase: $GPG_PASSPHRASE Name-Real: Docker Release Tool -Name-Email: docker@dotcloud.com +Name-Email: docker@docker.com Name-Comment: releasedocker Expire-Date: 0 %commit diff --git a/hack/vendor.sh b/hack/vendor.sh index 6f07ba68ef..6b780f0fa8 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -63,4 +63,4 @@ mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar clone git github.com/godbus/dbus v1 clone git github.com/coreos/go-systemd v2 -clone git github.com/docker/libcontainer cf45d141db69ce11dcccac178e5607a385609e15 +clone git github.com/docker/libcontainer e6a43c1c2b9f769deb96348a0a93417cd48a36d8 diff --git a/image/graph.go b/image/graph.go index 64a38d7a29..31fbdd9ad8 100644 --- a/image/graph.go +++ b/image/graph.go @@ -1,7 +1,7 @@ package image import ( - "github.com/dotcloud/docker/daemon/graphdriver" + "github.com/docker/docker/daemon/graphdriver" ) type Graph interface { diff --git a/image/image.go b/image/image.go index 5c250947ce..e57311aa86 100644 --- a/image/image.go +++ b/image/image.go @@ -3,10 +3,10 @@ package image import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" "io/ioutil" "os" "path" diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 3b1c1c230e..bf957ada84 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/dotcloud/docker/archive" + "github.com/docker/docker/archive" ) func TestBuildCacheADD(t *testing.T) { diff --git a/integration-cli/docker_cli_links_test.go b/integration-cli/docker_cli_links_test.go index cb48866456..9cd1a3fbc5 100644 --- a/integration-cli/docker_cli_links_test.go +++ b/integration-cli/docker_cli_links_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/dotcloud/docker/pkg/iptables" + "github.com/docker/docker/pkg/iptables" ) func TestEtcHostsRegularFile(t *testing.T) { diff --git a/integration-cli/docker_cli_nat_test.go b/integration-cli/docker_cli_nat_test.go index 3816e54050..caa41aa0ab 100644 --- a/integration-cli/docker_cli_nat_test.go +++ b/integration-cli/docker_cli_nat_test.go @@ -7,7 +7,7 @@ import ( "os/exec" "testing" - "github.com/dotcloud/docker/daemon" + "github.com/docker/docker/daemon" ) func TestNetworkNat(t *testing.T) { diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 293c835f5e..63d3b133f1 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -12,7 +12,7 @@ import ( "sync" "testing" - "github.com/dotcloud/docker/pkg/networkfs/resolvconf" + "github.com/docker/docker/pkg/networkfs/resolvconf" ) // "test123" should be printed by docker run diff --git a/integration/api_test.go b/integration/api_test.go index b8414b6179..e5f93fb072 100644 --- a/integration/api_test.go +++ b/integration/api_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/dotcloud/docker/api" - "github.com/dotcloud/docker/api/server" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/docker/docker/api" + "github.com/docker/docker/api/server" + "github.com/docker/docker/engine" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestGetContainersJSON(t *testing.T) { diff --git a/integration/auth_test.go b/integration/auth_test.go index 8109bbb130..42cd1ac64d 100644 --- a/integration/auth_test.go +++ b/integration/auth_test.go @@ -4,10 +4,11 @@ import ( "crypto/rand" "encoding/hex" "fmt" - "github.com/dotcloud/docker/registry" "os" "strings" "testing" + + "github.com/docker/docker/registry" ) // FIXME: these tests have an external dependency on a staging index hosted @@ -17,13 +18,13 @@ import ( func TestLogin(t *testing.T) { t.Skip("FIXME: please remove dependency on external services") - os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com") + os.Setenv("DOCKER_INDEX_URL", "https://registry-stage.hub.docker.com/v1/") defer os.Setenv("DOCKER_INDEX_URL", "") authConfig := ®istry.AuthConfig{ Username: "unittester", Password: "surlautrerivejetattendrai", Email: "noise+unittester@docker.com", - ServerAddress: "https://indexstaging-docker.dotcloud.com/v1/", + ServerAddress: "https://registry-stage.hub.docker.com/v1/", } status, err := registry.Login(authConfig, nil) if err != nil { @@ -47,7 +48,7 @@ func TestCreateAccount(t *testing.T) { Username: username, Password: "test42", Email: fmt.Sprintf("docker-ut+%s@example.com", token), - ServerAddress: "https://indexstaging-docker.dotcloud.com/v1/", + ServerAddress: "https://registry-stage.hub.docker.com/v1/", } status, err := registry.Login(authConfig, nil) if err != nil { diff --git a/integration/commands_test.go b/integration/commands_test.go index 28210e7536..1e9f18eaf8 100644 --- a/integration/commands_test.go +++ b/integration/commands_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - "github.com/dotcloud/docker/api/client" - "github.com/dotcloud/docker/daemon" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/api/client" + "github.com/docker/docker/daemon" + "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/utils" ) func closeWrap(args ...io.Closer) error { diff --git a/integration/container_test.go b/integration/container_test.go index cd2b9ba070..4462aba08d 100644 --- a/integration/container_test.go +++ b/integration/container_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/dotcloud/docker/runconfig" + "github.com/docker/docker/runconfig" ) func TestKillDifferentUser(t *testing.T) { diff --git a/integration/graph_test.go b/integration/graph_test.go index dc056f7e1c..c6a0740ca5 100644 --- a/integration/graph_test.go +++ b/integration/graph_test.go @@ -2,12 +2,12 @@ package docker import ( "errors" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon/graphdriver" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/graph" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon/graphdriver" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/graph" + "github.com/docker/docker/image" + "github.com/docker/docker/utils" "io" "io/ioutil" "os" diff --git a/integration/https_test.go b/integration/https_test.go index 34c16cf9f9..b15f4e5694 100644 --- a/integration/https_test.go +++ b/integration/https_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/dotcloud/docker/api/client" + "github.com/docker/docker/api/client" ) const ( diff --git a/integration/runtime_test.go b/integration/runtime_test.go index 4c0f636d60..713c95fb32 100644 --- a/integration/runtime_test.go +++ b/integration/runtime_test.go @@ -16,13 +16,13 @@ import ( "testing" "time" - "github.com/dotcloud/docker/daemon" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/sysinit" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/daemon" + "github.com/docker/docker/engine" + "github.com/docker/docker/image" + "github.com/docker/docker/nat" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/sysinit" + "github.com/docker/docker/utils" ) const ( diff --git a/integration/server_test.go b/integration/server_test.go index aab6802f53..71ec93cdc2 100644 --- a/integration/server_test.go +++ b/integration/server_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/runconfig" + "github.com/docker/docker/engine" + "github.com/docker/docker/runconfig" ) func TestCreateNumberHostname(t *testing.T) { diff --git a/integration/utils_test.go b/integration/utils_test.go index 7be7f13eee..e44bda85a5 100644 --- a/integration/utils_test.go +++ b/integration/utils_test.go @@ -13,14 +13,14 @@ import ( "testing" "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" - "github.com/dotcloud/docker/builtins" - "github.com/dotcloud/docker/daemon" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/server" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/builtins" + "github.com/docker/docker/daemon" + "github.com/docker/docker/engine" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/server" + "github.com/docker/docker/utils" ) // This file contains utility functions for docker's unit test suite. diff --git a/integration/z_final_test.go b/integration/z_final_test.go index 6065230b92..ad1eb43409 100644 --- a/integration/z_final_test.go +++ b/integration/z_final_test.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" "runtime" "testing" ) diff --git a/links/links.go b/links/links.go index 45c1935c20..d2d699398e 100644 --- a/links/links.go +++ b/links/links.go @@ -2,8 +2,8 @@ package links import ( "fmt" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/engine" + "github.com/docker/docker/nat" "path" "strings" ) diff --git a/links/links_test.go b/links/links_test.go index e79ef1a136..c26559e599 100644 --- a/links/links_test.go +++ b/links/links_test.go @@ -1,7 +1,7 @@ package links import ( - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/nat" "strings" "testing" ) diff --git a/nat/nat.go b/nat/nat.go index 31633dd544..8c402e94bf 100644 --- a/nat/nat.go +++ b/nat/nat.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) const ( diff --git a/opts/opts.go b/opts/opts.go index b3ceeffda6..434ea03722 100644 --- a/opts/opts.go +++ b/opts/opts.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) // ListOpts type diff --git a/pkg/mflag/example/example.go b/pkg/mflag/example/example.go index 8af8ff9cf4..2e766dd1e5 100644 --- a/pkg/mflag/example/example.go +++ b/pkg/mflag/example/example.go @@ -3,7 +3,7 @@ package main import ( "fmt" - flag "github.com/dotcloud/docker/pkg/mflag" + flag "github.com/docker/docker/pkg/mflag" ) var ( diff --git a/pkg/mflag/flag.go b/pkg/mflag/flag.go index 52f786e451..6e3f039707 100644 --- a/pkg/mflag/flag.go +++ b/pkg/mflag/flag.go @@ -10,7 +10,7 @@ Define flags using flag.String(), Bool(), Int(), etc. This declares an integer flag, -f or --flagname, stored in the pointer ip, with type *int. - import "flag /github.com/dotcloud/docker/pkg/mflag" + import "flag /github.com/docker/docker/pkg/mflag" var ip = flag.Int([]string{"f", "-flagname"}, 1234, "help message for flagname") If you like, you can bind the flag to a variable using the Var() functions. var flagvar int diff --git a/pkg/mflag/flag_test.go b/pkg/mflag/flag_test.go index 4c2222e54b..2aa6fdab00 100644 --- a/pkg/mflag/flag_test.go +++ b/pkg/mflag/flag_test.go @@ -7,7 +7,7 @@ package mflag_test import ( "bytes" "fmt" - . "github.com/dotcloud/docker/pkg/mflag" + . "github.com/docker/docker/pkg/mflag" "os" "sort" "strings" diff --git a/pkg/term/MAINTAINERS b/pkg/term/MAINTAINERS index 1887dfc232..aee10c8421 100644 --- a/pkg/term/MAINTAINERS +++ b/pkg/term/MAINTAINERS @@ -1 +1 @@ -Solomon Hykes (@shykes) +Solomon Hykes (@shykes) diff --git a/pkg/truncindex/truncindex_test.go b/pkg/truncindex/truncindex_test.go index f88d667d5a..32c41c7d76 100644 --- a/pkg/truncindex/truncindex_test.go +++ b/pkg/truncindex/truncindex_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) // Test the behavior of TruncIndex, an index for querying IDs from a non-conflicting prefix. diff --git a/registry/MAINTAINERS b/registry/MAINTAINERS index 6ed4e9d650..fdb03ed573 100644 --- a/registry/MAINTAINERS +++ b/registry/MAINTAINERS @@ -1,5 +1,5 @@ -Sam Alba (@samalba) -Joffrey Fuhrer (@shin-) -Ken Cochrane (@kencochrane) +Sam Alba (@samalba) +Joffrey Fuhrer (@shin-) +Ken Cochrane (@kencochrane) Vincent Batts (@vbatts) Olivier Gambier (@dmp42) diff --git a/registry/auth.go b/registry/auth.go index 7384efbad6..906a37dde7 100644 --- a/registry/auth.go +++ b/registry/auth.go @@ -11,7 +11,7 @@ import ( "path" "strings" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) // Where we store the config file @@ -20,7 +20,7 @@ const CONFIGFILE = ".dockercfg" // Only used for user auth + account creation const INDEXSERVER = "https://index.docker.io/v1/" -//const INDEXSERVER = "https://indexstaging-docker.dotcloud.com/v1/" +//const INDEXSERVER = "https://registry-stage.hub.docker.com/v1/" var ( ErrConfigFileMissing = errors.New("The Auth config file is missing") diff --git a/registry/registry.go b/registry/registry.go index 974e7fb9f8..567cd9f70f 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/utils" ) var ( diff --git a/registry/registry_mock_test.go b/registry/registry_mock_test.go index 6b00751318..1a622228e3 100644 --- a/registry/registry_mock_test.go +++ b/registry/registry_mock_test.go @@ -3,7 +3,7 @@ package registry import ( "encoding/json" "fmt" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" "github.com/gorilla/mux" "io" "io/ioutil" diff --git a/registry/registry_test.go b/registry/registry_test.go index 5cec059505..12dc7a28a4 100644 --- a/registry/registry_test.go +++ b/registry/registry_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) var ( @@ -145,7 +145,7 @@ func TestPushImageLayerRegistry(t *testing.T) { } func TestResolveRepositoryName(t *testing.T) { - _, _, err := ResolveRepositoryName("https://github.com/dotcloud/docker") + _, _, err := ResolveRepositoryName("https://github.com/docker/docker") assertEqual(t, err, ErrInvalidRepositoryName, "Expected error invalid repo name") ep, repo, err := ResolveRepositoryName("fooo/bar") if err != nil { diff --git a/registry/service.go b/registry/service.go index 89a4baa729..d2775e3cd1 100644 --- a/registry/service.go +++ b/registry/service.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/dotcloud/docker/engine" + "github.com/docker/docker/engine" ) // Service exposes registry capabilities in the standard Engine diff --git a/runconfig/config.go b/runconfig/config.go index 8a069c64c7..c00110bf71 100644 --- a/runconfig/config.go +++ b/runconfig/config.go @@ -1,8 +1,8 @@ package runconfig import ( - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/engine" + "github.com/docker/docker/nat" ) // Note: the Config structure should hold only portable information about the container. diff --git a/runconfig/config_test.go b/runconfig/config_test.go index 3b57b0a603..7d3aa01b7d 100644 --- a/runconfig/config_test.go +++ b/runconfig/config_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/dotcloud/docker/nat" + "github.com/docker/docker/nat" ) func parse(t *testing.T, args string) (*Config, *HostConfig, error) { diff --git a/runconfig/hostconfig.go b/runconfig/hostconfig.go index c68f764588..77e5fd8adb 100644 --- a/runconfig/hostconfig.go +++ b/runconfig/hostconfig.go @@ -3,9 +3,9 @@ package runconfig import ( "strings" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/engine" + "github.com/docker/docker/nat" + "github.com/docker/docker/utils" ) type NetworkMode string diff --git a/runconfig/merge.go b/runconfig/merge.go index e30b4cec24..290d5f3189 100644 --- a/runconfig/merge.go +++ b/runconfig/merge.go @@ -3,8 +3,8 @@ package runconfig import ( "strings" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/nat" + "github.com/docker/docker/utils" ) func Merge(userConf, imageConf *Config) error { diff --git a/runconfig/parse.go b/runconfig/parse.go index c3ce8a5a70..fe16e9caaf 100644 --- a/runconfig/parse.go +++ b/runconfig/parse.go @@ -6,12 +6,12 @@ import ( "path" "strings" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/opts" - flag "github.com/dotcloud/docker/pkg/mflag" - "github.com/dotcloud/docker/pkg/sysinfo" - "github.com/dotcloud/docker/pkg/units" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/nat" + "github.com/docker/docker/opts" + flag "github.com/docker/docker/pkg/mflag" + "github.com/docker/docker/pkg/sysinfo" + "github.com/docker/docker/pkg/units" + "github.com/docker/docker/utils" ) var ( diff --git a/runconfig/parse_test.go b/runconfig/parse_test.go index 94cea493f0..a45a864924 100644 --- a/runconfig/parse_test.go +++ b/runconfig/parse_test.go @@ -3,7 +3,7 @@ package runconfig import ( "testing" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) func TestParseLxcConfOpt(t *testing.T) { diff --git a/server/buildfile.go b/server/buildfile.go index 71fed660b2..e8e8dbec5a 100644 --- a/server/buildfile.go +++ b/server/buildfile.go @@ -19,14 +19,14 @@ import ( "syscall" "time" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon" - "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/pkg/symlink" - "github.com/dotcloud/docker/pkg/system" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon" + "github.com/docker/docker/nat" + "github.com/docker/docker/pkg/symlink" + "github.com/docker/docker/pkg/system" + "github.com/docker/docker/registry" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" ) var ( diff --git a/server/server.go b/server/server.go index 4e9e773307..d9787317a7 100644 --- a/server/server.go +++ b/server/server.go @@ -45,20 +45,20 @@ import ( "syscall" "time" - "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/daemon" - "github.com/dotcloud/docker/daemonconfig" - "github.com/dotcloud/docker/dockerversion" - "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/graph" - "github.com/dotcloud/docker/image" - "github.com/dotcloud/docker/pkg/graphdb" - "github.com/dotcloud/docker/pkg/signal" - "github.com/dotcloud/docker/pkg/tailfile" - "github.com/dotcloud/docker/registry" - "github.com/dotcloud/docker/runconfig" - "github.com/dotcloud/docker/utils" - "github.com/dotcloud/docker/utils/filters" + "github.com/docker/docker/archive" + "github.com/docker/docker/daemon" + "github.com/docker/docker/daemonconfig" + "github.com/docker/docker/dockerversion" + "github.com/docker/docker/engine" + "github.com/docker/docker/graph" + "github.com/docker/docker/image" + "github.com/docker/docker/pkg/graphdb" + "github.com/docker/docker/pkg/signal" + "github.com/docker/docker/pkg/tailfile" + "github.com/docker/docker/registry" + "github.com/docker/docker/runconfig" + "github.com/docker/docker/utils" + "github.com/docker/docker/utils/filters" ) func (srv *Server) handlerWrap(h engine.Handler) engine.Handler { diff --git a/server/server_unit_test.go b/server/server_unit_test.go index e6c5d49b82..91ca709f4f 100644 --- a/server/server_unit_test.go +++ b/server/server_unit_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) func TestPools(t *testing.T) { diff --git a/sysinit/sysinit.go b/sysinit/sysinit.go index 1b8746f02a..9da6a5fc5d 100644 --- a/sysinit/sysinit.go +++ b/sysinit/sysinit.go @@ -6,9 +6,9 @@ import ( "log" "os" - "github.com/dotcloud/docker/daemon/execdriver" - _ "github.com/dotcloud/docker/daemon/execdriver/lxc" - _ "github.com/dotcloud/docker/daemon/execdriver/native" + "github.com/docker/docker/daemon/execdriver" + _ "github.com/docker/docker/daemon/execdriver/lxc" + _ "github.com/docker/docker/daemon/execdriver/native" ) func executeProgram(args *execdriver.InitArgs) error { diff --git a/utils/broadcastwriter/broadcastwriter.go b/utils/broadcastwriter/broadcastwriter.go index 9bd2c1471e..f094744e37 100644 --- a/utils/broadcastwriter/broadcastwriter.go +++ b/utils/broadcastwriter/broadcastwriter.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/dotcloud/docker/utils" + "github.com/docker/docker/utils" ) // BroadcastWriter accumulate multiple io.WriteCloser by stream. diff --git a/utils/jsonmessage.go b/utils/jsonmessage.go index 922f3df739..7ad4548c38 100644 --- a/utils/jsonmessage.go +++ b/utils/jsonmessage.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/dotcloud/docker/pkg/term" - "github.com/dotcloud/docker/pkg/units" + "github.com/docker/docker/pkg/term" + "github.com/docker/docker/pkg/units" ) type JSONError struct { diff --git a/utils/tarsum.go b/utils/tarsum.go index 67e94aaebc..afdf128ce6 100644 --- a/utils/tarsum.go +++ b/utils/tarsum.go @@ -5,7 +5,7 @@ import ( "compress/gzip" "crypto/sha256" "encoding/hex" - "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" "hash" "io" "sort" diff --git a/utils/tarsum_test.go b/utils/tarsum_test.go index e84abde916..7904292ddf 100644 --- a/utils/tarsum_test.go +++ b/utils/tarsum_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "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 testLayer struct { diff --git a/utils/utils.go b/utils/utils.go index 0d44ec0f72..0d3b4d0acb 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -22,7 +22,7 @@ import ( "syscall" "time" - "github.com/dotcloud/docker/dockerversion" + "github.com/docker/docker/dockerversion" ) type KeyValuePair struct { diff --git a/utils/utils_test.go b/utils/utils_test.go index 6fd09b97db..5ea1f30b21 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -128,23 +128,23 @@ func TestParseRepositoryTag(t *testing.T) { func TestCheckLocalDns(t *testing.T) { for resolv, result := range map[string]bool{`# Dynamic nameserver 10.0.2.3 -search dotcloud.net`: false, +search docker.com`: false, `# Dynamic #nameserver 127.0.0.1 nameserver 10.0.2.3 -search dotcloud.net`: false, +search docker.com`: false, `# Dynamic nameserver 10.0.2.3 #not used 127.0.1.1 -search dotcloud.net`: false, +search docker.com`: false, `# Dynamic #nameserver 10.0.2.3 -#search dotcloud.net`: true, +#search docker.com`: true, `# Dynamic nameserver 127.0.0.1 -search dotcloud.net`: true, +search docker.com`: true, `# Dynamic nameserver 127.0.1.1 -search dotcloud.net`: true, +search docker.com`: true, `# Dynamic `: true, ``: true, diff --git a/vendor/src/github.com/docker/libcontainer/.travis.yml b/vendor/src/github.com/docker/libcontainer/.travis.yml index 5ce4587689..7040d0bd71 100644 --- a/vendor/src/github.com/docker/libcontainer/.travis.yml +++ b/vendor/src/github.com/docker/libcontainer/.travis.yml @@ -6,14 +6,15 @@ sudo: false env: - TRAVIS_GLOBAL_WTF=1 - - _GOOS=linux _GOARCH=amd64 -# - _GOOS=linux _GOARCH=386 # Travis can't currently do 32bit cgo... (see https://travis-ci.org/tianon/libcontainer/jobs/30126518#L168) -# - _GOOS=linux _GOARCH=arm # see https://github.com/moovweb/gvm/issues/22 + - _GOOS=linux _GOARCH=amd64 CGO_ENABLED=1 + - _GOOS=linux _GOARCH=amd64 CGO_ENABLED=0 +# - _GOOS=linux _GOARCH=386 CGO_ENABLED=1 # TODO add this once Travis can handle it (https://github.com/travis-ci/travis-ci/issues/2207#issuecomment-49625061) + - _GOOS=linux _GOARCH=386 CGO_ENABLED=0 + - _GOOS=linux _GOARCH=arm CGO_ENABLED=0 install: - mkdir -pv "${GOPATH%%:*}/src/github.com/docker" && [ -d "${GOPATH%%:*}/src/github.com/docker/libcontainer" ] || ln -sv "$(readlink -f .)" "${GOPATH%%:*}/src/github.com/docker/libcontainer" - if [ -z "$TRAVIS_GLOBAL_WTF" ]; then - export CGO_ENABLED=1; gvm cross "$_GOOS" "$_GOARCH"; export GOOS="$_GOOS" GOARCH="$_GOARCH"; fi @@ -30,4 +31,4 @@ script: - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-dco"; fi - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-gofmt"; fi - if [ -z "$TRAVIS_GLOBAL_WTF" ]; then go build -v ./...; fi - - if [ -z "$TRAVIS_GLOBAL_WTF" ]; then go test -v ./...; fi + - if [ -z "$TRAVIS_GLOBAL_WTF" -a "$GOARCH" != 'arm' ]; then go test -test.short -v ./...; fi diff --git a/vendor/src/github.com/docker/libcontainer/Dockerfile b/vendor/src/github.com/docker/libcontainer/Dockerfile index 73789d1ab2..1fbba3e531 100644 --- a/vendor/src/github.com/docker/libcontainer/Dockerfile +++ b/vendor/src/github.com/docker/libcontainer/Dockerfile @@ -1,8 +1,21 @@ FROM crosbymichael/golang RUN apt-get update && apt-get install -y gcc +RUN go get code.google.com/p/go.tools/cmd/cover -ADD . /go/src/github.com/docker/libcontainer -RUN cd /go/src/github.com/docker/libcontainer && go get -d ./... && go install ./... +# setup a playground for us to spawn containers in +RUN mkdir /busybox && \ + curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.02/rootfs.tar' | tar -xC /busybox -CMD ["nsinit"] +RUN curl -sSL https://raw.githubusercontent.com/docker/docker/master/hack/dind -o /dind && \ + chmod +x /dind + +COPY . /go/src/github.com/docker/libcontainer +WORKDIR /go/src/github.com/docker/libcontainer +RUN cp sample_configs/minimal.json /busybox/container.json + +RUN go get -d -v ./... +RUN go install -v ./... + +ENTRYPOINT ["/dind"] +CMD ["go", "test", "-cover", "./..."] diff --git a/vendor/src/github.com/docker/libcontainer/Makefile b/vendor/src/github.com/docker/libcontainer/Makefile new file mode 100644 index 0000000000..843b761eda --- /dev/null +++ b/vendor/src/github.com/docker/libcontainer/Makefile @@ -0,0 +1,10 @@ + +all: + docker build -t docker/libcontainer . + +test: + # we need NET_ADMIN for the netlink tests and SYS_ADMIN for mounting + docker run --rm --cap-add NET_ADMIN --cap-add SYS_ADMIN docker/libcontainer + +sh: + docker run --rm -ti -w /busybox --rm --cap-add NET_ADMIN --cap-add SYS_ADMIN docker/libcontainer nsinit exec sh diff --git a/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go index 5755a5f4b7..01e5bf49b1 100644 --- a/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/systemd/apply_systemd.go @@ -14,9 +14,9 @@ import ( "time" systemd1 "github.com/coreos/go-systemd/dbus" + "github.com/docker/docker/pkg/systemd" "github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups/fs" - "github.com/dotcloud/docker/pkg/systemd" "github.com/godbus/dbus" ) diff --git a/vendor/src/github.com/docker/libcontainer/cgroups/utils.go b/vendor/src/github.com/docker/libcontainer/cgroups/utils.go index 0d19b3eaae..ce5c4f3364 100644 --- a/vendor/src/github.com/docker/libcontainer/cgroups/utils.go +++ b/vendor/src/github.com/docker/libcontainer/cgroups/utils.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/dotcloud/docker/pkg/mount" + "github.com/docker/docker/pkg/mount" ) // https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt @@ -97,7 +97,7 @@ func GetAllSubsystems() ([]string, error) { text := s.Text() if text[0] != '#' { parts := strings.Fields(text) - if len(parts) > 4 && parts[3] != "0" { + if len(parts) >= 4 && parts[3] != "0" { subsystems = append(subsystems, parts[0]) } } diff --git a/vendor/src/github.com/docker/libcontainer/devices/defaults.go b/vendor/src/github.com/docker/libcontainer/devices/defaults.go index 393c438c59..e0ad0b08f8 100644 --- a/vendor/src/github.com/docker/libcontainer/devices/defaults.go +++ b/vendor/src/github.com/docker/libcontainer/devices/defaults.go @@ -146,8 +146,8 @@ var ( // /dev/fuse is created but not allowed. // This is to allow java to work. Because java // Insists on there being a /dev/fuse - // https://github.com/dotcloud/docker/issues/514 - // https://github.com/dotcloud/docker/issues/2393 + // https://github.com/docker/docker/issues/514 + // https://github.com/docker/docker/issues/2393 // Path: "/dev/fuse", Type: 'c', diff --git a/vendor/src/github.com/docker/libcontainer/mount/init.go b/vendor/src/github.com/docker/libcontainer/mount/init.go index a59b4a76fe..7edea49994 100644 --- a/vendor/src/github.com/docker/libcontainer/mount/init.go +++ b/vendor/src/github.com/docker/libcontainer/mount/init.go @@ -8,9 +8,9 @@ import ( "path/filepath" "syscall" + "github.com/docker/docker/pkg/symlink" "github.com/docker/libcontainer/label" "github.com/docker/libcontainer/mount/nodes" - "github.com/dotcloud/docker/pkg/symlink" ) // default mount point flags @@ -52,9 +52,17 @@ func InitializeMountNamespace(rootfs, console string, sysReadonly bool, mountCon if err := SetupPtmx(rootfs, console, mountConfig.MountLabel); err != nil { return err } + + // stdin, stdout and stderr could be pointing to /dev/null from parent namespace. + // Re-open them inside this namespace. + if err := reOpenDevNull(rootfs); err != nil { + return fmt.Errorf("Failed to reopen /dev/null %s", err) + } + if err := setupDevSymlinks(rootfs); err != nil { return fmt.Errorf("dev symlinks %s", err) } + if err := syscall.Chdir(rootfs); err != nil { return fmt.Errorf("chdir into %s %s", rootfs, err) } @@ -208,3 +216,29 @@ func newSystemMounts(rootfs, mountLabel string, sysReadonly bool, mounts Mounts) return systemMounts } + +// Is stdin, stdout or stderr were to be pointing to '/dev/null', +// this method will make them point to '/dev/null' from within this namespace. +func reOpenDevNull(rootfs string) error { + var stat, devNullStat syscall.Stat_t + file, err := os.Open(filepath.Join(rootfs, "/dev/null")) + if err != nil { + return fmt.Errorf("Failed to open /dev/null - %s", err) + } + defer file.Close() + if err = syscall.Fstat(int(file.Fd()), &devNullStat); err != nil { + return fmt.Errorf("Failed to stat /dev/null - %s", err) + } + for fd := 0; fd < 3; fd++ { + if err = syscall.Fstat(fd, &stat); err != nil { + return fmt.Errorf("Failed to stat fd %d - %s", fd, err) + } + if stat.Rdev == devNullStat.Rdev { + // Close and re-open the fd. + if err = syscall.Dup2(int(file.Fd()), fd); err != nil { + return fmt.Errorf("Failed to dup fd %d to fd %d - %s", file.Fd(), fd) + } + } + } + return nil +} diff --git a/vendor/src/github.com/docker/libcontainer/namespaces/execin.go b/vendor/src/github.com/docker/libcontainer/namespaces/execin.go index 5311adf2b3..3a385cb77f 100644 --- a/vendor/src/github.com/docker/libcontainer/namespaces/execin.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/execin.go @@ -4,32 +4,96 @@ package namespaces import ( "encoding/json" - "os" - "strconv" - "github.com/docker/libcontainer" "github.com/docker/libcontainer/label" "github.com/docker/libcontainer/system" + "io" + "os" + "os/exec" + "strconv" + "syscall" ) +// Runs the command under 'args' inside an existing container referred to by 'container'. +// Returns the exitcode of the command upon success and appropriate error on failure. +func RunIn(container *libcontainer.Config, state *libcontainer.State, args []string, nsinitPath string, stdin io.Reader, stdout, stderr io.Writer, console string, startCallback func(*exec.Cmd)) (int, error) { + initArgs, err := getNsEnterCommand(strconv.Itoa(state.InitPid), container, console, args) + if err != nil { + return -1, err + } + + cmd := exec.Command(nsinitPath, initArgs...) + // Note: these are only used in non-tty mode + // if there is a tty for the container it will be opened within the namespace and the + // fds will be duped to stdin, stdiout, and stderr + cmd.Stdin = stdin + cmd.Stdout = stdout + cmd.Stderr = stderr + + if err := cmd.Start(); err != nil { + return -1, err + } + if startCallback != nil { + startCallback(cmd) + } + + if err := cmd.Wait(); err != nil { + if _, ok := err.(*exec.ExitError); !ok { + return -1, err + } + } + + return cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus(), nil +} + // ExecIn uses an existing pid and joins the pid's namespaces with the new command. func ExecIn(container *libcontainer.Config, state *libcontainer.State, args []string) error { - // TODO(vmarmol): If this gets too long, send it over a pipe to the child. - // Marshall the container into JSON since it won't be available in the namespace. - containerJson, err := json.Marshal(container) + // Enter the namespace and then finish setup + args, err := getNsEnterCommand(strconv.Itoa(state.InitPid), container, "", args) if err != nil { return err } - // Enter the namespace and then finish setup - finalArgs := []string{os.Args[0], "nsenter", "--nspid", strconv.Itoa(state.InitPid), "--containerjson", string(containerJson), "--"} - finalArgs = append(finalArgs, args...) + finalArgs := append([]string{os.Args[0]}, args...) + if err := system.Execv(finalArgs[0], finalArgs[0:], os.Environ()); err != nil { return err } + panic("unreachable") } +func getContainerJson(container *libcontainer.Config) (string, error) { + // TODO(vmarmol): If this gets too long, send it over a pipe to the child. + // Marshall the container into JSON since it won't be available in the namespace. + containerJson, err := json.Marshal(container) + if err != nil { + return "", err + } + return string(containerJson), nil +} + +func getNsEnterCommand(initPid string, container *libcontainer.Config, console string, args []string) ([]string, error) { + containerJson, err := getContainerJson(container) + if err != nil { + return nil, err + } + + out := []string{ + "nsenter", + "--nspid", initPid, + "--containerjson", containerJson, + } + + if console != "" { + out = append(out, "--console", console) + } + out = append(out, "--") + out = append(out, args...) + + return out, nil +} + // Run a command in a container after entering the namespace. func NsEnter(container *libcontainer.Config, args []string) error { // clear the current processes env and replace it with the environment diff --git a/vendor/src/github.com/docker/libcontainer/namespaces/init.go b/vendor/src/github.com/docker/libcontainer/namespaces/init.go index 62452cba16..e43db3965c 100644 --- a/vendor/src/github.com/docker/libcontainer/namespaces/init.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/init.go @@ -9,6 +9,7 @@ import ( "strings" "syscall" + "github.com/docker/docker/pkg/user" "github.com/docker/libcontainer" "github.com/docker/libcontainer/apparmor" "github.com/docker/libcontainer/console" @@ -21,7 +22,6 @@ import ( "github.com/docker/libcontainer/syncpipe" "github.com/docker/libcontainer/system" "github.com/docker/libcontainer/utils" - "github.com/dotcloud/docker/pkg/user" ) // TODO(vishh): This is part of the libcontainer API and it does much more than just namespaces related work. diff --git a/vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go b/vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go index d5eaa27143..cddfa44253 100644 --- a/vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go +++ b/vendor/src/github.com/docker/libcontainer/namespaces/nsenter.go @@ -88,6 +88,7 @@ void nsenter() { static const struct option longopts[] = { { "nspid", required_argument, NULL, 'n' }, { "containerjson", required_argument, NULL, 'c' }, + { "console", required_argument, NULL, 't' }, { NULL, 0, NULL, 0 } }; @@ -95,6 +96,7 @@ void nsenter() { pid_t init_pid = -1; char *init_pid_str = NULL; char *container_json = NULL; + char *console = NULL; while ((c = getopt_long_only(argc, argv, "n:s:c:", longopts, NULL)) != -1) { switch (c) { case 'n': @@ -103,6 +105,9 @@ void nsenter() { case 'c': container_json = optarg; break; + case 't': + console = optarg; + break; } } @@ -121,6 +126,21 @@ void nsenter() { argc -= 3; argv += 3; + if (setsid() == -1) { + fprintf(stderr, "setsid failed. Error: %s\n", strerror(errno)); + exit(1); + } + + // before we setns we need to dup the console + int consolefd = -1; + if (console != NULL) { + consolefd = open(console, O_RDWR); + if (consolefd < 0) { + fprintf(stderr, "nsenter: failed to open console %s %s\n", console, strerror(errno)); + exit(1); + } + } + // Setns on all supported namespaces. char ns_dir[PATH_MAX]; memset(ns_dir, 0, PATH_MAX); @@ -159,6 +179,21 @@ void nsenter() { // We must fork to actually enter the PID namespace. int child = fork(); if (child == 0) { + if (consolefd != -1) { + if (dup2(consolefd, STDIN_FILENO) != 0) { + fprintf(stderr, "nsenter: failed to dup 0 %s\n", strerror(errno)); + exit(1); + } + if (dup2(consolefd, STDOUT_FILENO) != STDOUT_FILENO) { + fprintf(stderr, "nsenter: failed to dup 1 %s\n", strerror(errno)); + exit(1); + } + if (dup2(consolefd, STDERR_FILENO) != STDERR_FILENO) { + fprintf(stderr, "nsenter: failed to dup 2 %s\n", strerror(errno)); + exit(1); + } +} + // Finish executing, let the Go runtime take over. return; } else { diff --git a/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go index 92accd4aaa..6b43fdf067 100644 --- a/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go +++ b/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux.go @@ -17,21 +17,27 @@ const ( VETH_INFO_PEER = 1 IFLA_NET_NS_FD = 28 SIOC_BRADDBR = 0x89a0 + SIOC_BRDELBR = 0x89a1 SIOC_BRADDIF = 0x89a2 ) var nextSeqNr uint32 type ifreqHwaddr struct { - IfrnName [16]byte + IfrnName [IFNAMSIZ]byte IfruHwaddr syscall.RawSockaddr } type ifreqIndex struct { - IfrnName [16]byte + IfrnName [IFNAMSIZ]byte IfruIndex int32 } +type ifreqFlags struct { + IfrnName [IFNAMSIZ]byte + Ifruflags uint16 +} + func nativeEndian() binary.ByteOrder { var x uint32 = 0x01020304 if *(*byte)(unsafe.Pointer(&x)) == 0x01 { @@ -843,6 +849,10 @@ func getIfSocket() (fd int, err error) { } func NetworkChangeName(iface *net.Interface, newName string) error { + if len(newName) >= IFNAMSIZ { + return fmt.Errorf("Interface name %s too long", newName) + } + fd, err := getIfSocket() if err != nil { return err @@ -895,13 +905,13 @@ func NetworkCreateVethPair(name1, name2 string) error { // Create the actual bridge device. This is more backward-compatible than // netlink.NetworkLinkAdd and works on RHEL 6. func CreateBridge(name string, setMacAddr bool) error { - s, err := syscall.Socket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_IP) + if len(name) >= IFNAMSIZ { + return fmt.Errorf("Interface name %s too long", name) + } + + s, err := getIfSocket() if err != nil { - // ipv6 issue, creating with ipv4 - s, err = syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_IP) - if err != nil { - return err - } + return err } defer syscall.Close(s) @@ -918,21 +928,48 @@ func CreateBridge(name string, setMacAddr bool) error { return nil } +// Delete the actual bridge device. +func DeleteBridge(name string) error { + s, err := getIfSocket() + if err != nil { + return err + } + defer syscall.Close(s) + + nameBytePtr, err := syscall.BytePtrFromString(name) + if err != nil { + return err + } + + var ifr ifreqFlags + copy(ifr.IfrnName[:len(ifr.IfrnName)-1], []byte(name)) + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(s), + syscall.SIOCSIFFLAGS, uintptr(unsafe.Pointer(&ifr))); err != 0 { + return err + } + + if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(s), + SIOC_BRDELBR, uintptr(unsafe.Pointer(nameBytePtr))); err != 0 { + return err + } + return nil +} + // Add a slave to abridge device. This is more backward-compatible than // netlink.NetworkSetMaster and works on RHEL 6. func AddToBridge(iface, master *net.Interface) error { - s, err := syscall.Socket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_IP) + if len(master.Name) >= IFNAMSIZ { + return fmt.Errorf("Interface name %s too long", master.Name) + } + + s, err := getIfSocket() if err != nil { - // ipv6 issue, creating with ipv4 - s, err = syscall.Socket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_IP) - if err != nil { - return err - } + return err } defer syscall.Close(s) ifr := ifreqIndex{} - copy(ifr.IfrnName[:], master.Name) + copy(ifr.IfrnName[:len(ifr.IfrnName)-1], master.Name) ifr.IfruIndex = int32(iface.Index) if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, uintptr(s), SIOC_BRADDIF, uintptr(unsafe.Pointer(&ifr))); err != 0 { @@ -943,9 +980,13 @@ func AddToBridge(iface, master *net.Interface) error { } func setBridgeMacAddress(s int, name string) error { + if len(name) >= IFNAMSIZ { + return fmt.Errorf("Interface name %s too long", name) + } + ifr := ifreqHwaddr{} ifr.IfruHwaddr.Family = syscall.ARPHRD_ETHER - copy(ifr.IfrnName[:], name) + copy(ifr.IfrnName[:len(ifr.IfrnName)-1], name) for i := 0; i < 6; i++ { ifr.IfruHwaddr.Data[i] = randIfrDataByte() diff --git a/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux_test.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux_test.go new file mode 100644 index 0000000000..ee61d5e266 --- /dev/null +++ b/vendor/src/github.com/docker/libcontainer/netlink/netlink_linux_test.go @@ -0,0 +1,55 @@ +package netlink + +import ( + "net" + "testing" +) + +func TestCreateBridgeWithMac(t *testing.T) { + if testing.Short() { + return + } + + name := "testbridge" + + if err := CreateBridge(name, true); err != nil { + t.Fatal(err) + } + + if _, err := net.InterfaceByName(name); err != nil { + t.Fatal(err) + } + + // cleanup and tests + + if err := DeleteBridge(name); err != nil { + t.Fatal(err) + } + + if _, err := net.InterfaceByName(name); err == nil { + t.Fatal("expected error getting interface because bridge was deleted") + } +} + +func TestCreateVethPair(t *testing.T) { + if testing.Short() { + return + } + + var ( + name1 = "veth1" + name2 = "veth2" + ) + + if err := NetworkCreateVethPair(name1, name2); err != nil { + t.Fatal(err) + } + + if _, err := net.InterfaceByName(name1); err != nil { + t.Fatal(err) + } + + if _, err := net.InterfaceByName(name2); err != nil { + t.Fatal(err) + } +} diff --git a/vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go b/vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go index 2c4d31940c..f428933c13 100644 --- a/vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go +++ b/vendor/src/github.com/docker/libcontainer/netlink/netlink_unsupported.go @@ -67,6 +67,10 @@ func CreateBridge(name string, setMacAddr bool) error { return ErrNotImplemented } +func DeleteBridge(name string) error { + return ErrNotImplemented +} + func AddToBridge(iface, master *net.Interface) error { return ErrNotImplemented } diff --git a/vendor/src/github.com/docker/libcontainer/network/stats.go b/vendor/src/github.com/docker/libcontainer/network/stats.go index b69fa91851..c8ece5c7b0 100644 --- a/vendor/src/github.com/docker/libcontainer/network/stats.go +++ b/vendor/src/github.com/docker/libcontainer/network/stats.go @@ -9,36 +9,37 @@ import ( ) type NetworkStats struct { - RxBytes uint64 `json:"rx_bytes,omitempty"` - RxPackets uint64 `json:"rx_packets,omitempty"` - RxErrors uint64 `json:"rx_errors,omitempty"` - RxDropped uint64 `json:"rx_dropped,omitempty"` - TxBytes uint64 `json:"tx_bytes,omitempty"` - TxPackets uint64 `json:"tx_packets,omitempty"` - TxErrors uint64 `json:"tx_errors,omitempty"` - TxDropped uint64 `json:"tx_dropped,omitempty"` + RxBytes uint64 `json:"rx_bytes"` + RxPackets uint64 `json:"rx_packets"` + RxErrors uint64 `json:"rx_errors"` + RxDropped uint64 `json:"rx_dropped"` + TxBytes uint64 `json:"tx_bytes"` + TxPackets uint64 `json:"tx_packets"` + TxErrors uint64 `json:"tx_errors"` + TxDropped uint64 `json:"tx_dropped"` } // Returns the network statistics for the network interfaces represented by the NetworkRuntimeInfo. -func GetStats(networkState *NetworkState) (NetworkStats, error) { +func GetStats(networkState *NetworkState) (*NetworkStats, error) { // This can happen if the network runtime information is missing - possible if the container was created by an old version of libcontainer. if networkState.VethHost == "" { - return NetworkStats{}, nil + return &NetworkStats{}, nil } data, err := readSysfsNetworkStats(networkState.VethHost) if err != nil { - return NetworkStats{}, err + return nil, err } - return NetworkStats{ - RxBytes: data["rx_bytes"], - RxPackets: data["rx_packets"], - RxErrors: data["rx_errors"], - RxDropped: data["rx_dropped"], - TxBytes: data["tx_bytes"], - TxPackets: data["tx_packets"], - TxErrors: data["tx_errors"], - TxDropped: data["tx_dropped"], + // Ingress for host veth is from the container. Hence tx_bytes stat on the host veth is actually number of bytes received by the container. + return &NetworkStats{ + RxBytes: data["tx_bytes"], + RxPackets: data["tx_packets"], + RxErrors: data["tx_errors"], + RxDropped: data["tx_dropped"], + TxBytes: data["rx_bytes"], + TxPackets: data["rx_packets"], + TxErrors: data["rx_errors"], + TxDropped: data["rx_dropped"], }, nil } diff --git a/vendor/src/github.com/docker/libcontainer/nsinit/exec.go b/vendor/src/github.com/docker/libcontainer/nsinit/exec.go index 690af5f5eb..5d41046656 100644 --- a/vendor/src/github.com/docker/libcontainer/nsinit/exec.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/exec.go @@ -10,10 +10,10 @@ import ( "syscall" "github.com/codegangsta/cli" + "github.com/docker/docker/pkg/term" "github.com/docker/libcontainer" consolepkg "github.com/docker/libcontainer/console" "github.com/docker/libcontainer/namespaces" - "github.com/dotcloud/docker/pkg/term" ) var execCommand = cli.Command{ @@ -36,7 +36,7 @@ func execAction(context *cli.Context) { } if state != nil { - err = namespaces.ExecIn(container, state, []string(context.Args())) + exitCode, err = runIn(container, state, []string(context.Args())) } else { exitCode, err = startContainer(container, dataPath, []string(context.Args())) } @@ -48,6 +48,59 @@ func execAction(context *cli.Context) { os.Exit(exitCode) } +func runIn(container *libcontainer.Config, state *libcontainer.State, args []string) (int, error) { + var ( + master *os.File + console string + err error + + stdin = os.Stdin + stdout = os.Stdout + stderr = os.Stderr + sigc = make(chan os.Signal, 10) + ) + + signal.Notify(sigc) + + if container.Tty { + stdin = nil + stdout = nil + stderr = nil + + master, console, err = consolepkg.CreateMasterAndConsole() + if err != nil { + log.Fatal(err) + } + + go io.Copy(master, os.Stdin) + go io.Copy(os.Stdout, master) + + state, err := term.SetRawTerminal(os.Stdin.Fd()) + if err != nil { + log.Fatal(err) + } + + defer term.RestoreTerminal(os.Stdin.Fd(), state) + } + + startCallback := func(cmd *exec.Cmd) { + go func() { + resizeTty(master) + + for sig := range sigc { + switch sig { + case syscall.SIGWINCH: + resizeTty(master) + default: + cmd.Process.Signal(sig) + } + } + }() + } + + return namespaces.RunIn(container, state, args, os.Args[0], stdin, stdout, stderr, console, startCallback) +} + // startContainer starts the container. Returns the exit status or -1 and an // error. // diff --git a/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go b/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go index 743b20a929..11d646ebea 100644 --- a/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go +++ b/vendor/src/github.com/docker/libcontainer/nsinit/nsenter.go @@ -14,6 +14,7 @@ var nsenterCommand = cli.Command{ Flags: []cli.Flag{ cli.IntFlag{Name: "nspid"}, cli.StringFlag{Name: "containerjson"}, + cli.StringFlag{Name: "console"}, }, } diff --git a/vendor/src/github.com/docker/libcontainer/selinux/selinux.go b/vendor/src/github.com/docker/libcontainer/selinux/selinux.go index 55da87ff26..bfa79578fe 100644 --- a/vendor/src/github.com/docker/libcontainer/selinux/selinux.go +++ b/vendor/src/github.com/docker/libcontainer/selinux/selinux.go @@ -15,8 +15,8 @@ import ( "strings" "syscall" + "github.com/docker/docker/pkg/mount" "github.com/docker/libcontainer/system" - "github.com/dotcloud/docker/pkg/mount" ) const ( diff --git a/vendor/src/github.com/docker/libcontainer/types.go b/vendor/src/github.com/docker/libcontainer/types.go index 5095dca66a..c341137ec8 100644 --- a/vendor/src/github.com/docker/libcontainer/types.go +++ b/vendor/src/github.com/docker/libcontainer/types.go @@ -6,6 +6,6 @@ import ( ) type ContainerStats struct { - NetworkStats network.NetworkStats `json:"network_stats, omitempty"` - CgroupStats *cgroups.Stats `json:"cgroup_stats, omitempty"` + NetworkStats *network.NetworkStats `json:"network_stats,omitempty"` + CgroupStats *cgroups.Stats `json:"cgroup_stats,omitempty"` }