From b8a5b1a486075f75f88a996306410d981c20530d Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Sat, 6 Dec 2014 21:23:09 +0000 Subject: [PATCH] Godeps: Switch to fork of github.com/docker/docker Signed-off-by: Lewis Marshall --- Godeps/Godeps.json | 138 +++++++++--------- .../docker/docker/archive/archive.go | 8 +- .../docker/docker/archive/archive_test.go | 2 +- .../docker/docker/archive/changes.go | 6 +- .../github.com/docker/docker/archive/diff.go | 2 +- .../github.com/docker/docker/archive/wrap.go | 3 +- .../graphdriver/overlayfs/overlayfs_test.go | 28 ---- .../docker/pkg/chrootarchive/archive_test.go | 44 ------ .../docker/daemon/graphdriver/aufs/aufs.go | 10 +- .../daemon/graphdriver/aufs/aufs_test.go | 6 +- .../docker/daemon/graphdriver/aufs/dirs.go | 0 .../docker/daemon/graphdriver/aufs/migrate.go | 0 .../docker/daemon/graphdriver/aufs/mount.go | 0 .../daemon/graphdriver/aufs/mount_linux.go | 0 .../graphdriver/aufs/mount_unsupported.go | 0 .../daemon/graphdriver/btrfs/MAINTAINERS | 0 .../docker/daemon/graphdriver/btrfs/btrfs.go | 4 +- .../daemon/graphdriver/btrfs/btrfs_test.go | 3 +- .../graphdriver/btrfs/dummy_unsupported.go | 0 .../daemon/graphdriver/btrfs/version_none.go | 0 .../daemon/graphdriver/btrfs/version_test.go | 0 .../daemon/graphdriver/devmapper/MAINTAINERS | 0 .../daemon/graphdriver/devmapper/README.md | 0 .../daemon/graphdriver/devmapper/deviceset.go | 8 +- .../graphdriver/devmapper/devmapper_doc.go | 0 .../graphdriver/devmapper/devmapper_test.go | 2 +- .../daemon/graphdriver/devmapper/driver.go | 8 +- .../daemon/graphdriver/devmapper/mount.go | 0 .../docker/daemon/graphdriver/driver.go | 4 +- .../docker/daemon/graphdriver/fsdiff.go | 8 +- .../daemon/graphdriver/graphtest/graphtest.go | 2 +- .../daemon/graphdriver/overlay}/copy.go | 8 +- .../daemon/graphdriver/overlay/overlay.go} | 42 +++--- .../graphdriver/overlay/overlay_test.go | 29 ++++ .../docker/daemon/graphdriver/vfs/driver.go | 4 +- .../docker/daemon/graphdriver/vfs/vfs_test.go | 4 +- .../daemon/networkdriver/bridge/driver.go | 36 ++--- .../networkdriver/bridge/driver_test.go | 4 +- .../networkdriver/ipallocator/allocator.go | 2 +- .../ipallocator/allocator_test.go | 0 .../docker/daemon/networkdriver/network.go | 0 .../daemon/networkdriver/network_test.go | 3 +- .../portallocator/portallocator.go | 0 .../portallocator/portallocator_test.go | 0 .../daemon/networkdriver/portmapper/mapper.go | 4 +- .../networkdriver/portmapper/mapper_test.go | 4 +- .../networkdriver/portmapper/mock_proxy.go | 0 .../daemon/networkdriver/portmapper/proxy.go | 4 +- .../docker/daemon/networkdriver/utils.go | 0 .../docker/dockerversion/dockerversion.go | 0 .../docker/pkg/archive/MAINTAINERS | 0 .../docker/pkg/archive/README.md | 0 .../docker/pkg/archive/archive.go | 40 +++-- .../docker/pkg/archive/archive_test.go | 18 ++- .../docker/pkg/archive/archive_unix.go | 2 +- .../docker/pkg/archive/archive_windows.go | 2 +- .../docker/pkg/archive/changes.go | 6 +- .../docker/pkg/archive/changes_test.go | 0 .../docker/pkg/archive/diff.go | 18 ++- .../docker/pkg/archive/diff_test.go | 2 +- .../docker/pkg/archive/example_changes.go | 2 +- .../docker/pkg/archive/testdata/broken.tar | Bin .../docker/pkg/archive/time_linux.go | 0 .../docker/pkg/archive/time_unsupported.go | 0 .../docker/pkg/archive/utils_test.go | 2 +- .../docker/pkg/archive/wrap.go | 3 +- .../docker/pkg/chrootarchive/archive.go | 9 +- .../docker/pkg/chrootarchive/archive_test.go | 85 +++++++++++ .../docker/pkg/chrootarchive/diff.go | 4 +- .../docker/pkg/chrootarchive/init.go | 2 +- .../docker/pkg/devicemapper/MAINTAINERS | 0 .../pkg/devicemapper/attach_loopback.go | 0 .../docker/pkg/devicemapper/devmapper.go | 0 .../docker/pkg/devicemapper/devmapper_log.go | 0 .../pkg/devicemapper/devmapper_wrapper.go | 0 .../docker/pkg/devicemapper/ioctl.go | 0 .../docker/pkg/fileutils/fileutils.go | 3 +- .../docker/pkg/ioutils/readers.go | 0 .../docker/pkg/ioutils/readers_test.go | 0 .../docker/pkg/ioutils/writers.go | 0 .../docker/pkg/mount/MAINTAINERS | 0 .../docker/pkg/mount/flags.go | 0 .../docker/pkg/mount/flags_freebsd.go | 0 .../docker/pkg/mount/flags_linux.go | 0 .../docker/pkg/mount/flags_unsupported.go | 0 .../docker/pkg/mount/mount.go | 0 .../docker/pkg/mount/mount_test.go | 0 .../docker/pkg/mount/mounter_freebsd.go | 0 .../docker/pkg/mount/mounter_linux.go | 0 .../docker/pkg/mount/mounter_unsupported.go | 0 .../docker/pkg/mount/mountinfo.go | 0 .../docker/pkg/mount/mountinfo_freebsd.go | 0 .../docker/pkg/mount/mountinfo_linux.go | 0 .../docker/pkg/mount/mountinfo_linux_test.go | 0 .../docker/pkg/mount/mountinfo_unsupported.go | 0 .../docker/pkg/mount/sharedsubtree_linux.go | 0 .../pkg/mount/sharedsubtree_linux_test.go | 2 +- .../docker/pkg/parsers/MAINTAINERS | 0 .../docker/pkg/parsers/filters/parse.go | 0 .../docker/pkg/parsers/filters/parse_test.go | 0 .../docker/pkg/parsers/kernel/kernel.go | 0 .../docker/pkg/parsers/kernel/kernel_test.go | 0 .../docker/pkg/parsers/kernel/uname_linux.go | 0 .../pkg/parsers/kernel/uname_unsupported.go | 0 .../operatingsystem/operatingsystem.go | 0 .../operatingsystem/operatingsystem_test.go | 0 .../docker/pkg/parsers/parsers.go | 0 .../docker/pkg/parsers/parsers_test.go | 0 .../docker/pkg/pools/pools.go | 2 +- .../docker/pkg/pools/pools_nopool.go | 2 +- .../docker/pkg/promise/promise.go | 0 .../docker/pkg/reexec/MAINTAINERS | 0 .../docker/pkg/reexec/README.md | 0 .../docker/pkg/reexec/command_linux.go | 0 .../docker/pkg/reexec/command_unsupported.go | 0 .../docker/pkg/reexec/reexec.go | 0 .../docker/pkg/signal/signal.go | 0 .../docker/pkg/signal/signal_darwin.go | 0 .../docker/pkg/signal/signal_freebsd.go | 0 .../docker/pkg/signal/signal_linux.go | 0 .../docker/pkg/signal/signal_unix.go | 0 .../docker/pkg/signal/signal_unsupported.go | 0 .../docker/pkg/signal/signal_windows.go | 0 .../docker/pkg/signal/trap.go | 0 .../docker/pkg/system/MAINTAINERS | 0 .../docker/pkg/system/errors.go | 0 .../docker/pkg/system/lstat.go | 0 .../docker/pkg/system/lstat_test.go | 0 .../docker/pkg/system/lstat_windows.go | 0 .../docker/pkg/system/meminfo.go | 0 .../docker/pkg/system/meminfo_linux.go | 2 +- .../docker/pkg/system/meminfo_linux_test.go | 2 +- .../docker/pkg/system/meminfo_unsupported.go | 0 .../docker/pkg/system/mknod.go | 0 .../docker/pkg/system/mknod_windows.go | 0 .../docker/pkg/system/stat.go | 0 .../docker/pkg/system/stat_linux.go | 0 .../docker/pkg/system/stat_test.go | 0 .../docker/pkg/system/stat_unsupported.go | 0 .../docker/pkg/system/stat_windows.go | 0 .../docker/pkg/system/umask.go | 0 .../docker/pkg/system/umask_windows.go | 0 .../docker/pkg/system/utimes_darwin.go | 0 .../docker/pkg/system/utimes_freebsd.go | 0 .../docker/pkg/system/utimes_linux.go | 0 .../docker/pkg/system/utimes_test.go | 0 .../docker/pkg/system/utimes_unsupported.go | 0 .../docker/pkg/system/xattrs_linux.go | 0 .../docker/pkg/system/xattrs_unsupported.go | 0 .../docker/pkg/term/MAINTAINERS | 0 .../docker/pkg/term/console_windows.go | 0 .../docker/pkg/term/tc_linux_cgo.go | 0 .../docker/pkg/term/tc_other.go | 0 .../{docker => flynn}/docker/pkg/term/term.go | 0 .../docker/pkg/term/term_windows.go | 0 .../docker/pkg/term/termios_darwin.go | 0 .../docker/pkg/term/termios_freebsd.go | 0 .../docker/pkg/term/termios_linux.go | 0 .../docker/pkg/timeutils/MAINTAINERS | 0 .../docker/pkg/timeutils/json.go | 0 .../docker/pkg/units/MAINTAINERS | 0 .../docker/pkg/units/duration.go | 0 .../docker/pkg/units/duration_test.go | 0 .../docker/pkg/units/size.go | 0 .../docker/pkg/units/size_test.go | 0 .../{docker => flynn}/docker/utils/daemon.go | 0 .../{docker => flynn}/docker/utils/http.go | 0 .../docker/utils/jsonmessage.go | 6 +- .../docker/utils/jsonmessage_test.go | 0 .../docker/utils/progressreader.go | 0 .../{docker => flynn}/docker/utils/random.go | 0 .../docker/utils/streamformatter.go | 0 .../docker/utils/streamformatter_test.go | 0 .../docker/utils/timeoutconn.go | 0 .../docker/utils/timeoutconn_test.go | 0 .../{docker => flynn}/docker/utils/tmpdir.go | 0 .../{docker => flynn}/docker/utils/utils.go | 8 +- .../docker/utils/utils_daemon.go | 0 .../docker/utils/utils_test.go | 0 .../p/go/src/pkg/archive/tar/common.go | 0 .../p/go/src/pkg/archive/tar/example_test.go | 0 .../p/go/src/pkg/archive/tar/reader.go | 0 .../p/go/src/pkg/archive/tar/reader_test.go | 0 .../p/go/src/pkg/archive/tar/stat_atim.go | 0 .../go/src/pkg/archive/tar/stat_atimespec.go | 0 .../p/go/src/pkg/archive/tar/stat_unix.go | 0 .../p/go/src/pkg/archive/tar/tar_test.go | 0 .../p/go/src/pkg/archive/tar/testdata/gnu.tar | Bin .../src/pkg/archive/tar/testdata/nil-uid.tar | Bin .../p/go/src/pkg/archive/tar/testdata/pax.tar | Bin .../go/src/pkg/archive/tar/testdata/small.txt | 0 .../src/pkg/archive/tar/testdata/small2.txt | 0 .../archive/tar/testdata/sparse-formats.tar | Bin .../go/src/pkg/archive/tar/testdata/star.tar | Bin .../go/src/pkg/archive/tar/testdata/ustar.tar | Bin .../p/go/src/pkg/archive/tar/testdata/v7.tar | Bin .../archive/tar/testdata/writer-big-long.tar | Bin .../pkg/archive/tar/testdata/writer-big.tar | Bin .../src/pkg/archive/tar/testdata/writer.tar | Bin .../src/pkg/archive/tar/testdata/xattrs.tar | Bin .../p/go/src/pkg/archive/tar/writer.go | 0 .../p/go/src/pkg/archive/tar/writer_test.go | 0 host/cli/download.go | 8 +- host/cli/ps.go | 2 +- host/containerinit/init.go | 2 +- host/libvirt_lxc_backend.go | 4 +- pinkerton/context.go | 12 +- pinkerton/store/store.go | 2 +- test/cluster/net.go | 2 +- 209 files changed, 380 insertions(+), 304 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go delete mode 100644 Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/aufs.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/aufs_test.go (98%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/dirs.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/migrate.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/mount.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/mount_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/aufs/mount_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/btrfs.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/btrfs_test.go (85%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/dummy_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/version_none.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/btrfs/version_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/README.md (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/deviceset.go (99%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/devmapper_doc.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/devmapper_test.go (90%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/driver.go (90%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/devmapper/mount.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/driver.go (97%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/fsdiff.go (92%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/graphtest/graphtest.go (98%) rename Godeps/_workspace/src/github.com/{docker/docker/daemon/graphdriver/overlayfs => flynn/docker/daemon/graphdriver/overlay}/copy.go (92%) rename Godeps/_workspace/src/github.com/{docker/docker/daemon/graphdriver/overlayfs/overlayfs.go => flynn/docker/daemon/graphdriver/overlay/overlay.go} (86%) create mode 100644 Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay_test.go rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/vfs/driver.go (91%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/graphdriver/vfs/vfs_test.go (76%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/bridge/driver.go (92%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/bridge/driver_test.go (95%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/ipallocator/allocator.go (98%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/ipallocator/allocator_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/network.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/network_test.go (99%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portallocator/portallocator.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portallocator/portallocator_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portmapper/mapper.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portmapper/mapper_test.go (95%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portmapper/mock_proxy.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/portmapper/proxy.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/daemon/networkdriver/utils.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/dockerversion/dockerversion.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/README.md (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/archive.go (94%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/archive_test.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/archive_unix.go (86%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/archive_windows.go (67%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/changes.go (97%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/changes_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/diff.go (89%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/diff_test.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/example_changes.go (96%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/testdata/broken.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/time_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/time_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/utils_test.go (97%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/archive/wrap.go (91%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/chrootarchive/archive.go (87%) create mode 100644 Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive_test.go rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/chrootarchive/diff.go (82%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/chrootarchive/init.go (72%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/attach_loopback.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/devmapper.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/devmapper_log.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/devmapper_wrapper.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/devicemapper/ioctl.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/fileutils/fileutils.go (99%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/ioutils/readers.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/ioutils/readers_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/ioutils/writers.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/flags.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/flags_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/flags_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/flags_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mount.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mount_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mounter_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mounter_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mounter_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mountinfo.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mountinfo_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mountinfo_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mountinfo_linux_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/mountinfo_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/sharedsubtree_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/mount/sharedsubtree_linux_test.go (99%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/filters/parse.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/filters/parse_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/kernel/kernel.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/kernel/kernel_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/kernel/uname_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/kernel/uname_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/operatingsystem/operatingsystem.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/operatingsystem/operatingsystem_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/parsers.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/parsers/parsers_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/pools/pools.go (97%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/pools/pools_nopool.go (94%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/promise/promise.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/reexec/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/reexec/README.md (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/reexec/command_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/reexec/command_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/reexec/reexec.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_darwin.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_unix.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/signal_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/signal/trap.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/errors.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/lstat.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/lstat_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/lstat_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/meminfo.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/meminfo_linux.go (93%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/meminfo_linux_test.go (89%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/meminfo_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/mknod.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/mknod_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/stat.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/stat_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/stat_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/stat_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/stat_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/umask.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/umask_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/utimes_darwin.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/utimes_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/utimes_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/utimes_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/utimes_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/xattrs_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/system/xattrs_unsupported.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/console_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/tc_linux_cgo.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/tc_other.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/term.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/term_windows.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/termios_darwin.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/termios_freebsd.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/term/termios_linux.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/timeutils/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/timeutils/json.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/units/MAINTAINERS (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/units/duration.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/units/duration_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/units/size.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/pkg/units/size_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/daemon.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/http.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/jsonmessage.go (94%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/jsonmessage_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/progressreader.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/random.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/streamformatter.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/streamformatter_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/timeoutconn.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/timeoutconn_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/tmpdir.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/utils.go (97%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/utils_daemon.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/utils/utils_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/common.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/example_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atim.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atimespec.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_unix.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/tar_test.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/gnu.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/nil-uid.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/pax.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small.txt (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small2.txt (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/sparse-formats.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/star.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/ustar.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/v7.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big-long.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/xattrs.tar (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer.go (100%) rename Godeps/_workspace/src/github.com/{docker => flynn}/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer_test.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 517f82b131..107fd14afb 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -66,119 +66,119 @@ "Rev": "6cc5a8b574de3ed084314996231c03b5dd21d8c6" }, { - "ImportPath": "github.com/docker/docker/daemon/graphdriver", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/docker/libcontainer/label", + "Comment": "v1.2.0-162-g7ce34f5", + "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" }, { - "ImportPath": "github.com/docker/docker/daemon/networkdriver", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/docker/libcontainer/netlink", + "Comment": "v1.2.0-162-g7ce34f5", + "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" }, { - "ImportPath": "github.com/docker/docker/dockerversion", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/docker/libcontainer/user", + "Comment": "v1.2.0-162-g7ce34f5", + "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" }, { - "ImportPath": "github.com/docker/docker/pkg/archive", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/daemon/graphdriver", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/chrootarchive", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/daemon/networkdriver", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/devicemapper", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/dockerversion", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/fileutils", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/archive", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/ioutils", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/chrootarchive", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/mount", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/devicemapper", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/parsers", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/fileutils", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/pools", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/ioutils", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/promise", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/mount", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/reexec", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/parsers", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/signal", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/pools", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/system", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/promise", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/term", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/reexec", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/timeutils", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/signal", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/pkg/units", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/system", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/utils", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/term", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar", - "Comment": "v1.3.0-764-g4083fa2", - "Rev": "4083fa26208fe4a1b78cad9ab85cdbb50293cedd" + "ImportPath": "github.com/flynn/docker/pkg/timeutils", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/libcontainer/label", - "Comment": "v1.2.0-162-g7ce34f5", - "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" + "ImportPath": "github.com/flynn/docker/pkg/units", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/libcontainer/netlink", - "Comment": "v1.2.0-162-g7ce34f5", - "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" + "ImportPath": "github.com/flynn/docker/utils", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { - "ImportPath": "github.com/docker/libcontainer/user", - "Comment": "v1.2.0-162-g7ce34f5", - "Rev": "7ce34f58cbd4884634a0f1f82c4aaab1168ea0de" + "ImportPath": "github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar", + "Comment": "v1.3.0-877-gd254baf", + "Rev": "d254baf18d300077d4ca03db48e3c7fb2a26ca18" }, { "ImportPath": "github.com/flynn/go-check", diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go b/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go index 5ce361d7ad..937182eba4 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go +++ b/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go @@ -16,11 +16,11 @@ import ( "strings" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/docker/docker/pkg/log" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/utils" + "github.com/flynn/docker/pkg/log" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/utils" ) type ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go b/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go index 953022ce38..4adf5a2d60 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go +++ b/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestCmdStreamLargeStderr(t *testing.T) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go b/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go index e56d1ad208..9c98a7da04 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go +++ b/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go @@ -11,10 +11,10 @@ import ( "syscall" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/docker/docker/pkg/log" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" + "github.com/flynn/docker/pkg/log" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" ) type ChangeType int diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go b/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go index 719d464d45..5a558ad8c7 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go +++ b/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go @@ -10,7 +10,7 @@ import ( "strings" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/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/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go b/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go index d92598024d..d29a9bc444 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go +++ b/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go @@ -2,8 +2,9 @@ package archive import ( "bytes" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io/ioutil" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) // Generate generates a new archive from the content provided diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go b/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go deleted file mode 100644 index b94d4a3e0c..0000000000 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go +++ /dev/null @@ -1,28 +0,0 @@ -package overlayfs - -import ( - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest" - "testing" -) - -// This avoids creating a new driver for each test if all tests are run -// Make sure to put new tests between TestOverlayfsSetup and TestOverlayfsTeardown -func TestOverlayfsSetup(t *testing.T) { - graphtest.GetDriver(t, "overlayfs") -} - -func TestOverlayfsCreateEmpty(t *testing.T) { - graphtest.DriverTestCreateEmpty(t, "overlayfs") -} - -func TestOverlayfsCreateBase(t *testing.T) { - graphtest.DriverTestCreateBase(t, "overlayfs") -} - -func TestOverlayfsCreateSnap(t *testing.T) { - graphtest.DriverTestCreateSnap(t, "overlayfs") -} - -func TestOverlayfsTeardown(t *testing.T) { - graphtest.PutDriver(t) -} diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go b/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go deleted file mode 100644 index 901868e089..0000000000 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package chrootarchive - -import ( - "io/ioutil" - "os" - "path/filepath" - "testing" - - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" -) - -func init() { - reexec.Init() -} - -func TestChrootTarUntar(t *testing.T) { - tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(tmpdir) - src := filepath.Join(tmpdir, "src") - if err := os.MkdirAll(src, 0700); err != nil { - t.Fatal(err) - } - if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil { - t.Fatal(err) - } - if err := ioutil.WriteFile(filepath.Join(src, "lolo"), []byte("hello lolo"), 0644); err != nil { - t.Fatal(err) - } - stream, err := archive.Tar(src, archive.Uncompressed) - if err != nil { - t.Fatal(err) - } - dest := filepath.Join(tmpdir, "src") - if err := os.MkdirAll(dest, 0700); err != nil { - t.Fatal(err) - } - if err := Untar(stream, dest, &archive.TarOptions{Excludes: []string{"lolo"}}); err != nil { - t.Fatal(err) - } -} diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs.go index e63eb34b3a..879a3caf05 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs.go @@ -31,12 +31,12 @@ import ( "syscall" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive" - mountpk "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/mount" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/utils" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/label" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive" + mountpk "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/utils" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs_test.go similarity index 98% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs_test.go index 4693edb6a6..21a864ac04 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/aufs_test.go @@ -9,9 +9,9 @@ import ( "path" "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/dirs.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/dirs.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/dirs.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/dirs.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/migrate.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/migrate.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/migrate.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/migrate.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs/mount_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs/mount_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs.go index 31d50cf3fa..430f2ffb89 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs.go @@ -16,8 +16,8 @@ import ( "syscall" "unsafe" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/mount" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs_test.go similarity index 85% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs_test.go index 3f57c71333..050b8a92f7 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/btrfs_test.go @@ -1,8 +1,9 @@ package btrfs import ( - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest" "testing" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest" ) // This avoids creating a new driver for each test if all tests are run diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/dummy_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/dummy_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/dummy_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/dummy_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/version_none.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/version_none.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/version_none.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/version_none.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/version_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/version_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs/version_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs/version_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/README.md b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/README.md rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/README.md diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/deviceset.go similarity index 99% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/deviceset.go index 6ea20fe291..03d7ff0dc3 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/deviceset.go @@ -19,11 +19,11 @@ import ( "time" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/label" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_doc.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/devmapper_doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_doc.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/devmapper_doc.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/devmapper_test.go similarity index 90% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/devmapper_test.go index 290f951eed..9b5f21ee49 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/devmapper_test.go @@ -5,7 +5,7 @@ package devmapper import ( "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/driver.go similarity index 90% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/driver.go index 5c6d0d0c99..df4416e3fc 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/driver.go @@ -9,10 +9,10 @@ import ( "path" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/mount" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/mount.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/mount.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper/mount.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper/mount.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/driver.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/driver.go similarity index 97% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/driver.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/driver.go index f9696b9992..8246b4e3c9 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/driver.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/driver.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" ) type FsMagic uint64 @@ -81,7 +81,7 @@ var ( "devicemapper", "vfs", // experimental, has to be enabled manually for now - "overlayfs", + "overlay", } ErrNotSupported = errors.New("driver not supported") diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/fsdiff.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/fsdiff.go similarity index 92% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/fsdiff.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/fsdiff.go index 5c7defb098..37ea3862d2 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/fsdiff.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/fsdiff.go @@ -5,10 +5,10 @@ import ( "time" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/utils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/utils" ) // naiveDiffDriver takes a ProtoDriver and adds the diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest/graphtest.go similarity index 98% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest/graphtest.go index a9e0ce2bce..a5f2fc56a6 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest/graphtest.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/copy.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/copy.go similarity index 92% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/copy.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/copy.go index 121a4dec44..4f4d478a5c 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/copy.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/copy.go @@ -1,6 +1,6 @@ // +build linux -package overlayfs +package overlay import ( "fmt" @@ -9,7 +9,7 @@ import ( "path/filepath" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" ) type CopyFlags int @@ -122,8 +122,8 @@ func copyDir(srcDir, dstDir string, flags CopyFlags) error { return err } - // We need to copy this attribute if it appears in an overlayfs upper layer, as - // this function is used to copy those. It is set by overlayfs if a directory + // We need to copy this attribute if it appears in an overlay upper layer, as + // this function is used to copy those. It is set by overlay if a directory // is removed and then re-created and should not inherit anything from the // same dir in the lower dir. if err := copyXattr(srcPath, dstPath, "trusted.overlay.opaque"); err != nil { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay.go similarity index 86% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay.go index 3dabbf0beb..d5348115dd 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay.go @@ -1,6 +1,6 @@ // +build linux -package overlayfs +package overlay import ( "bufio" @@ -9,14 +9,14 @@ import ( "os" "os/exec" "path" - "strings" "sync" "syscall" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/label" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive" ) // This is a small wrapper over the NaiveDiffWriter that lets us have a custom @@ -51,18 +51,18 @@ func (d *naiveDiffDriverWithApply) ApplyDiff(id, parent string, diff archive.Arc return b, err } -// This backend uses the overlayfs union filesystem for containers +// This backend uses the overlay union filesystem for containers // plus hard link file sharing for images. // Each container/image can have a "root" subdirectory which is a plain -// filesystem hierarchy, or they can use overlayfs. +// filesystem hierarchy, or they can use overlay. -// If they use overlayfs there is a "upper" directory and a "lower-id" +// If they use overlay there is a "upper" directory and a "lower-id" // file, as well as "merged" and "work" directories. The "upper" // directory has the upper layer of the overlay, and "lower-id" contains // the id of the parent whose "root" directory shall be used as the lower // layer in the overlay. The overlay itself is mounted in the "merged" -// directory, and the "work" dir is needed for overlayfs to work. +// directory, and the "work" dir is needed for overlay to work. // When a overlay layer is created there are two cases, either the // parent has a "root" dir, then we start out with a empty "upper" @@ -91,11 +91,11 @@ type Driver struct { } func init() { - graphdriver.Register("overlayfs", Init) + graphdriver.Register("overlay", Init) } func Init(home string, options []string) (graphdriver.Driver, error) { - if err := supportsOverlayfs(); err != nil { + if err := supportsOverlay(); err != nil { return nil, graphdriver.ErrNotSupported } @@ -112,10 +112,10 @@ func Init(home string, options []string) (graphdriver.Driver, error) { return NaiveDiffDriverWithApply(d), nil } -func supportsOverlayfs() error { - // We can try to modprobe overlayfs first before looking at - // proc/filesystems for when overlayfs is supported - exec.Command("modprobe", "overlayfs").Run() +func supportsOverlay() error { + // We can try to modprobe overlay first before looking at + // proc/filesystems for when overlay is supported + exec.Command("modprobe", "overlay").Run() f, err := os.Open("/proc/filesystems") if err != nil { @@ -125,16 +125,16 @@ func supportsOverlayfs() error { s := bufio.NewScanner(f) for s.Scan() { - if strings.Contains(s.Text(), "overlayfs") { + if s.Text() == "nodev\toverlay" { return nil } } - log.Error("'overlayfs' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlayfs support loaded.") + log.Error("'overlay' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlay support loaded.") return graphdriver.ErrNotSupported } func (d *Driver) String() string { - return "overlayfs" + return "overlay" } func (d *Driver) Status() [][2]string { @@ -176,7 +176,7 @@ func (d *Driver) Create(id string, parent string) (retErr error) { return err } - // If parent has a root, just do a overlayfs to it + // If parent has a root, just do a overlay to it parentRoot := path.Join(parentDir, "root") if s, err := os.Lstat(parentRoot); err == nil { @@ -274,7 +274,7 @@ func (d *Driver) Get(id string, mountLabel string) (string, error) { mergedDir := path.Join(dir, "merged") opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir) - if err := syscall.Mount("overlayfs", mergedDir, "overlayfs", 0, label.FormatMountLabel(opts, mountLabel)); err != nil { + if err := syscall.Mount("overlay", mergedDir, "overlay", 0, label.FormatMountLabel(opts, mountLabel)); err != nil { return "", err } mount.path = mergedDir @@ -302,7 +302,7 @@ func (d *Driver) Put(id string) { if mount.mounted { if err := syscall.Unmount(mount.path, 0); err != nil { - log.Debugf("Failed to unmount %s overlayfs: %v", id, err) + log.Debugf("Failed to unmount %s overlay: %v", id, err) } } @@ -347,7 +347,7 @@ func (d *Driver) ApplyDiff(id string, parent string, diff archive.ArchiveReader) return 0, err } - if err := archive.ApplyLayer(tmpRootDir, diff); err != nil { + if err := chrootarchive.ApplyLayer(tmpRootDir, diff); err != nil { return 0, err } diff --git a/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay_test.go new file mode 100644 index 0000000000..c80b21600c --- /dev/null +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/overlay/overlay_test.go @@ -0,0 +1,29 @@ +package overlay + +import ( + "testing" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest" +) + +// This avoids creating a new driver for each test if all tests are run +// Make sure to put new tests between TestOverlaySetup and TestOverlayTeardown +func TestOverlaySetup(t *testing.T) { + graphtest.GetDriver(t, "overlay") +} + +func TestOverlayCreateEmpty(t *testing.T) { + graphtest.DriverTestCreateEmpty(t, "overlay") +} + +func TestOverlayCreateBase(t *testing.T) { + graphtest.DriverTestCreateBase(t, "overlay") +} + +func TestOverlayCreateSnap(t *testing.T) { + graphtest.DriverTestCreateSnap(t, "overlay") +} + +func TestOverlayTeardown(t *testing.T) { + graphtest.PutDriver(t) +} diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/driver.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/driver.go similarity index 91% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/driver.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/driver.go index a0ff033ad2..2e7e0c195b 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/driver.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/driver.go @@ -7,9 +7,9 @@ import ( "os/exec" "path" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/label" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/vfs_test.go similarity index 76% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/vfs_test.go index 1fbedb0cff..ef64aac5a4 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs/vfs_test.go @@ -3,9 +3,9 @@ package vfs import ( "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/graphtest" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/graphtest" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver.go similarity index 92% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver.go index fa4e0c9aa5..6399ece1d2 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver.go @@ -8,17 +8,16 @@ import ( "strconv" "sync" + "github.com/flynn/docker/engine" + "github.com/flynn/docker/nat" + "github.com/flynn/docker/pkg/iptables" + "github.com/flynn/docker/pkg/networkfs/resolvconf" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper" - "github.com/docker/docker/engine" - "github.com/docker/docker/nat" - "github.com/docker/docker/pkg/iptables" - "github.com/docker/docker/pkg/networkfs/resolvconf" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel" ) const ( @@ -468,22 +467,13 @@ func AllocatePort(job *engine.Job) engine.Status { if host, err = portmapper.Map(container, ip, hostPort); err == nil { break } - - if allocerr, ok := err.(portallocator.ErrPortAlreadyAllocated); ok { - // There is no point in immediately retrying to map an explicitly - // chosen port. - if hostPort != 0 { - job.Logf("Failed to bind %s for container address %s: %s", allocerr.IPPort(), container.String(), allocerr.Error()) - break - } - - // Automatically chosen 'free' port failed to bind: move on the next. - job.Logf("Failed to bind %s for container address %s. Trying another port.", allocerr.IPPort(), container.String()) - } else { - // some other error during mapping - job.Logf("Received an unexpected error during port allocation: %s", err.Error()) + // There is no point in immediately retrying to map an explicitly + // chosen port. + if hostPort != 0 { + job.Logf("Failed to allocate and map port %d: %s", hostPort, err) break } + job.Logf("Failed to allocate and map port: %s, retry: %d", err, i+1) } if err != nil { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver_test.go similarity index 95% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver_test.go index 6ccc224ec3..3b95fd73b8 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/bridge/driver_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/bridge/driver_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper" - "github.com/docker/docker/engine" + "github.com/flynn/docker/engine" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator/allocator.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator/allocator.go similarity index 98% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator/allocator.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator/allocator.go index 0a547cf074..84ee5c1733 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator/allocator.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator/allocator.go @@ -7,7 +7,7 @@ import ( "sync" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver" ) // allocatedMap is thread-unsafe set of allocated IP diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator/allocator_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator/allocator_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator/allocator_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator/allocator_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/network.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/network.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/network.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/network.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/network_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/network_test.go similarity index 99% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/network_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/network_test.go index 7b1b8f9718..31752cf6d5 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/network_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/network_test.go @@ -1,9 +1,10 @@ package networkdriver import ( - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" "net" "testing" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" ) func TestNonOverlapingNameservers(t *testing.T) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator/portallocator.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator/portallocator.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator/portallocator.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator/portallocator.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator/portallocator_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator/portallocator_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator/portallocator_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator/portallocator_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper.go index 91db7bc933..518bb79ea3 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper.go @@ -6,9 +6,9 @@ import ( "net" "sync" + "github.com/flynn/docker/pkg/iptables" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator" - "github.com/docker/docker/pkg/iptables" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator" ) type mapping struct { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper_test.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper_test.go similarity index 95% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper_test.go index 4b398d43e2..5c45dfa4d3 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mapper_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mapper_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portallocator" - "github.com/docker/docker/pkg/iptables" + "github.com/flynn/docker/pkg/iptables" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portallocator" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mock_proxy.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mock_proxy.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/mock_proxy.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/mock_proxy.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/proxy.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/proxy.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/proxy.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/proxy.go index 85aea8ae0c..e0b0265fdb 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/portmapper/proxy.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/portmapper/proxy.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/docker/docker/pkg/proxy" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/docker/pkg/proxy" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) const userlandProxyCommandName = "docker-proxy" diff --git a/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/utils.go b/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/utils.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/utils.go rename to Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/utils.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/dockerversion/dockerversion.go b/Godeps/_workspace/src/github.com/flynn/docker/dockerversion/dockerversion.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/dockerversion/dockerversion.go rename to Godeps/_workspace/src/github.com/flynn/docker/dockerversion/dockerversion.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/README.md b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/README.md rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/README.md diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive.go similarity index 94% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive.go index 8f48d6d43b..bd73fe9bac 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive.go @@ -16,13 +16,13 @@ import ( "strings" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/fileutils" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/pools" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/promise" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/fileutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/promise" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" ) type ( @@ -530,10 +530,13 @@ loop: } } - // Prevent symlink breakout path := filepath.Join(dest, hdr.Name) - if !strings.HasPrefix(path, dest) { - return breakoutError(fmt.Errorf("%q is outside of %q", path, dest)) + rel, err := filepath.Rel(dest, path) + if err != nil { + return err + } + if strings.HasPrefix(rel, "..") { + return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest)) } // If path exits we almost always just want to remove and replace it @@ -768,20 +771,33 @@ func NewTempArchive(src Archive, dir string) (*TempArchive, error) { return nil, err } size := st.Size() - return &TempArchive{f, size, 0}, nil + return &TempArchive{File: f, Size: size}, nil } type TempArchive struct { *os.File - Size int64 // Pre-computed from Stat().Size() as a convenience - read int64 + Size int64 // Pre-computed from Stat().Size() as a convenience + read int64 + closed bool +} + +// Close closes the underlying file if it's still open, or does a no-op +// to allow callers to try to close the TempArchive multiple times safely. +func (archive *TempArchive) Close() error { + if archive.closed { + return nil + } + + archive.closed = true + + return archive.File.Close() } func (archive *TempArchive) Read(data []byte) (int, error) { n, err := archive.File.Read(data) archive.read += int64(n) if err != nil || archive.read == archive.Size { - archive.File.Close() + archive.Close() os.Remove(archive.File.Name()) } return n, err diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_test.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_test.go index 43eb475f64..96c1ab37ea 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_test.go @@ -9,11 +9,12 @@ import ( "os/exec" "path" "path/filepath" + "strings" "syscall" "testing" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestCmdStreamLargeStderr(t *testing.T) { @@ -607,3 +608,18 @@ func TestUntarInvalidSymlink(t *testing.T) { } } } + +func TestTempArchiveCloseMultipleTimes(t *testing.T) { + reader := ioutil.NopCloser(strings.NewReader("hello")) + tempArchive, err := NewTempArchive(reader, "") + buf := make([]byte, 10) + n, err := tempArchive.Read(buf) + if n != 5 { + t.Fatalf("Expected to read 5 bytes. Read %d instead", n) + } + for i := 0; i < 3; i++ { + if err = tempArchive.Close(); err != nil { + t.Fatalf("i=%d. Unexpected error closing temp archive: %v", i, err) + } + } +} diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_unix.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_unix.go similarity index 86% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_unix.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_unix.go index b822c1d82d..c4d6977ca9 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_unix.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_unix.go @@ -6,7 +6,7 @@ import ( "errors" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_windows.go similarity index 67% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_windows.go index ae6cbf6c83..6b3fca21d6 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/archive_windows.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/archive_windows.go @@ -3,7 +3,7 @@ package archive import ( - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (nlink uint32, inode uint64, err error) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/changes.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/changes.go similarity index 97% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/changes.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/changes.go index 5d66ab048d..9aa3ae7f2a 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/changes.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/changes.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/pools" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" ) type ChangeType int diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/changes_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/changes_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/changes_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/changes_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff.go similarity index 89% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff.go index 304971c3cd..8f513635df 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff.go @@ -9,10 +9,10 @@ import ( "strings" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/pools" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/system" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/system" ) // ApplyLayer parses a diff in the standard layer format from `layer`, and @@ -92,12 +92,14 @@ func ApplyLayer(dest string, layer ArchiveReader) error { } path := filepath.Join(dest, hdr.Name) - base := filepath.Base(path) - - // Prevent symlink breakout - if !strings.HasPrefix(path, dest) { - return breakoutError(fmt.Errorf("%q is outside of %q", path, dest)) + rel, err := filepath.Rel(dest, path) + if err != nil { + return err + } + if strings.HasPrefix(rel, "..") { + return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest)) } + base := filepath.Base(path) if strings.HasPrefix(base, ".wh.") { originalBase := base[len(".wh."):] diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff_test.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff_test.go index b8dc29aa7d..a2b860ea55 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/diff_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/diff_test.go @@ -3,7 +3,7 @@ package archive import ( "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) func TestApplyLayerInvalidFilenames(t *testing.T) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/example_changes.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/example_changes.go similarity index 96% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/example_changes.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/example_changes.go index 08b3e4708b..cce9bffcbd 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/example_changes.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/example_changes.go @@ -14,7 +14,7 @@ import ( "path" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/testdata/broken.tar b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/testdata/broken.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/testdata/broken.tar rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/testdata/broken.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/time_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/time_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/time_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/time_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/time_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/time_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/time_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/time_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/utils_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/utils_test.go similarity index 97% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/utils_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/utils_test.go index 634385a35f..97aa143f63 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/utils_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/utils_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) var testUntarFns = map[string]func(string, io.Reader) error{ diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/wrap.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/wrap.go similarity index 91% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/archive/wrap.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/wrap.go index d92598024d..d29a9bc444 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/archive/wrap.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive/wrap.go @@ -2,8 +2,9 @@ package archive import ( "bytes" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "io/ioutil" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" ) // Generate generates a new archive from the content provided diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive.go similarity index 87% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive.go index c4f27c1ad6..ce8cc64eea 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive.go @@ -6,13 +6,14 @@ import ( "flag" "fmt" "io" + "io/ioutil" "os" "runtime" "strings" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) func untar() { @@ -33,6 +34,10 @@ func untar() { if err := archive.Untar(os.Stdin, "/", options); err != nil { fatal(err) } + // fully consume stdin in case it is zero padded + if _, err := ioutil.ReadAll(os.Stdin); err != nil { + fatal(err) + } os.Exit(0) } diff --git a/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive_test.go new file mode 100644 index 0000000000..3e701640b1 --- /dev/null +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/archive_test.go @@ -0,0 +1,85 @@ +package chrootarchive + +import ( + "io" + "io/ioutil" + "os" + "path/filepath" + "testing" + "time" + + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" +) + +func init() { + reexec.Init() +} + +func TestChrootTarUntar(t *testing.T) { + tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(tmpdir) + src := filepath.Join(tmpdir, "src") + if err := os.MkdirAll(src, 0700); err != nil { + t.Fatal(err) + } + if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil { + t.Fatal(err) + } + if err := ioutil.WriteFile(filepath.Join(src, "lolo"), []byte("hello lolo"), 0644); err != nil { + t.Fatal(err) + } + stream, err := archive.Tar(src, archive.Uncompressed) + if err != nil { + t.Fatal(err) + } + dest := filepath.Join(tmpdir, "src") + if err := os.MkdirAll(dest, 0700); err != nil { + t.Fatal(err) + } + if err := Untar(stream, dest, &archive.TarOptions{Excludes: []string{"lolo"}}); err != nil { + t.Fatal(err) + } +} + +type slowEmptyTarReader struct { + size int + offset int + chunkSize int +} + +// Read is a slow reader of an empty tar (like the output of "tar c --files-from /dev/null") +func (s *slowEmptyTarReader) Read(p []byte) (int, error) { + time.Sleep(100 * time.Millisecond) + count := s.chunkSize + if len(p) < s.chunkSize { + count = len(p) + } + for i := 0; i < count; i++ { + p[i] = 0 + } + s.offset += count + if s.offset > s.size { + return count, io.EOF + } + return count, nil +} + +func TestChrootUntarEmptyArchiveFromSlowReader(t *testing.T) { + tmpdir, err := ioutil.TempDir("", "docker-TestChrootUntarEmptyArchiveFromSlowReader") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(tmpdir) + dest := filepath.Join(tmpdir, "dest") + if err := os.MkdirAll(dest, 0700); err != nil { + t.Fatal(err) + } + stream := &slowEmptyTarReader{size: 10240, chunkSize: 1024} + if err := Untar(stream, dest, nil); err != nil { + t.Fatal(err) + } +} diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/diff.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/diff.go similarity index 82% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/diff.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/diff.go index 1dc109130a..c20a143a4c 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/diff.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/diff.go @@ -8,8 +8,8 @@ import ( "runtime" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) func applyLayer() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/init.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/init.go similarity index 72% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/init.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/init.go index ae835903e1..115fdec74f 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/init.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/chrootarchive/init.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" ) func init() { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/attach_loopback.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/attach_loopback.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/attach_loopback.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/attach_loopback.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper_log.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper_log.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper_log.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper_log.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper_wrapper.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/devmapper_wrapper.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/ioctl.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/ioctl.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/devicemapper/ioctl.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/devicemapper/ioctl.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/fileutils/fileutils.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/fileutils/fileutils.go similarity index 99% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/fileutils/fileutils.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/fileutils/fileutils.go index 9dbf50de30..91ea4d2887 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/fileutils/fileutils.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/fileutils/fileutils.go @@ -1,8 +1,9 @@ package fileutils import ( - log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" "path/filepath" + + log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" ) // Matches returns true if relFilePath matches any of the patterns diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/readers.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/readers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/readers.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/readers.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/readers_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/readers_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/readers_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/readers_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/writers.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/writers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils/writers.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils/writers.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/flags_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/flags_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mount.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mount.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mount_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mount_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mount_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mounter_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_linux_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_linux_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/mountinfo_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/sharedsubtree_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/sharedsubtree_linux_test.go similarity index 99% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/sharedsubtree_linux_test.go index 145d57bbd8..0986bd9c75 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/mount/sharedsubtree_linux_test.go @@ -312,7 +312,7 @@ func TestSubtreeUnbindable(t *testing.T) { if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil && err != syscall.EINVAL { t.Fatal(err) } else if err == nil { - t.Fatalf("%q should not have been bindable") + t.Fatalf("%q should not have been bindable", sourceDir) } defer func() { if err := Unmount(targetDir); err != nil { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/filters/parse.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/filters/parse.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/filters/parse.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/filters/parse.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/filters/parse_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/filters/parse_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/filters/parse_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/filters/parse_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/kernel.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/kernel.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/kernel.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/kernel.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/kernel_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/kernel_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/kernel_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/kernel_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/uname_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/uname_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/uname_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/uname_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/uname_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/uname_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/kernel/uname_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/kernel/uname_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/operatingsystem/operatingsystem.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/operatingsystem/operatingsystem.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/operatingsystem/operatingsystem_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/operatingsystem/operatingsystem_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/parsers.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/parsers.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/parsers.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/parsers.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/parsers_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/parsers_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/parsers/parsers_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/parsers/parsers_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools.go similarity index 97% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools.go index 49a9cd256e..bf9705ea71 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools.go @@ -16,7 +16,7 @@ import ( "io" "sync" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools_nopool.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools_nopool.go similarity index 94% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools_nopool.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools_nopool.go index e99c76263d..2df4283a43 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/pools/pools_nopool.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/pools/pools_nopool.go @@ -6,7 +6,7 @@ import ( "bufio" "io" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/promise/promise.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/promise/promise.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/promise/promise.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/promise/promise.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/README.md b/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/README.md rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/README.md diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/command_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/command_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/command_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/command_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/command_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/command_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/command_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/command_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/reexec.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/reexec.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/reexec/reexec.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec/reexec.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_darwin.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_darwin.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_darwin.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_unix.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_unix.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/signal_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/signal_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/signal/trap.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/trap.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/signal/trap.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/signal/trap.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/errors.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/errors.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/errors.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/errors.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/lstat_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/lstat_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux.go similarity index 93% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux.go index 55bf0373e9..a7eea190d3 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" ) var ( diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux_test.go similarity index 89% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux_test.go index 2ad3271a69..51f17c77d3 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_linux_test.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_linux_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" ) func TestMemInfo(t *testing.T) { diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/meminfo_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/mknod.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/mknod.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/mknod_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/mknod_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/mknod_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/stat_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/stat_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/umask.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/umask.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/umask_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/umask_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/umask_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_darwin.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_darwin.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_darwin.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/utimes_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/utimes_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/xattrs_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/xattrs_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/system/xattrs_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/system/xattrs_unsupported.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/console_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/console_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/console_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/console_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_linux_cgo.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/tc_linux_cgo.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_linux_cgo.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/tc_linux_cgo.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_other.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/tc_other.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/tc_other.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/tc_other.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/term.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/term.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/term.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/term_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/term_windows.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_darwin.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_darwin.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_darwin.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_freebsd.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_freebsd.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_freebsd.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_freebsd.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_linux.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/term/termios_linux.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/term/termios_linux.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/timeutils/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/timeutils/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/json.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/timeutils/json.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils/json.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/timeutils/json.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/MAINTAINERS b/Godeps/_workspace/src/github.com/flynn/docker/pkg/units/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/MAINTAINERS rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/units/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/units/duration.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/units/duration.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/units/duration_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/duration_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/units/duration_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/units/size.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/size.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/units/size.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/units/size_test.go b/Godeps/_workspace/src/github.com/flynn/docker/pkg/units/size_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/pkg/units/size_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/pkg/units/size_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/daemon.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/daemon.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/daemon.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/daemon.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/http.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/http.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/http.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/http.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/jsonmessage.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/jsonmessage.go similarity index 94% rename from Godeps/_workspace/src/github.com/docker/docker/utils/jsonmessage.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/jsonmessage.go index f22571820f..567691825a 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/utils/jsonmessage.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/utils/jsonmessage.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/term" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/timeutils" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/term" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/timeutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" ) type JSONError struct { diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/jsonmessage_test.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/jsonmessage_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/jsonmessage_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/jsonmessage_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/progressreader.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/progressreader.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/progressreader.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/progressreader.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/random.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/random.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/random.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/random.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/streamformatter.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/streamformatter.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/streamformatter.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/streamformatter.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/streamformatter_test.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/streamformatter_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/streamformatter_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/streamformatter_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/timeoutconn.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/timeoutconn.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/timeoutconn.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/timeoutconn.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/timeoutconn_test.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/timeoutconn_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/timeoutconn_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/timeoutconn_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/tmpdir.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/tmpdir.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/tmpdir.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/tmpdir.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/utils.go similarity index 97% rename from Godeps/_workspace/src/github.com/docker/docker/utils/utils.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/utils.go index 5ec64a3f82..c6cab83322 100644 --- a/Godeps/_workspace/src/github.com/docker/docker/utils/utils.go +++ b/Godeps/_workspace/src/github.com/flynn/docker/utils/utils.go @@ -20,10 +20,10 @@ import ( "sync" log "github.com/flynn/flynn/Godeps/_workspace/src/github.com/Sirupsen/logrus" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/dockerversion" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/archive" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/fileutils" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/ioutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/dockerversion" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/archive" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/fileutils" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/ioutils" ) type KeyValuePair struct { diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/utils_daemon.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/utils_daemon.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/utils_daemon.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/utils_daemon.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/utils/utils_test.go b/Godeps/_workspace/src/github.com/flynn/docker/utils/utils_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/utils/utils_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/utils/utils_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/common.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/common.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/common.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/common.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/example_test.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/example_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/example_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/example_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader_test.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/reader_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atim.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atim.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atim.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atim.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atimespec.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atimespec.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atimespec.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_atimespec.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_unix.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_unix.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/stat_unix.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/tar_test.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/tar_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/tar_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/tar_test.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/gnu.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/gnu.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/gnu.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/gnu.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/nil-uid.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/nil-uid.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/nil-uid.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/nil-uid.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/pax.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/pax.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/pax.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/pax.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small.txt b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small.txt similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small.txt rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small.txt diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small2.txt b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small2.txt similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small2.txt rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/small2.txt diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/sparse-formats.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/sparse-formats.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/sparse-formats.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/sparse-formats.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/star.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/star.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/star.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/star.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/ustar.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/ustar.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/ustar.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/ustar.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/v7.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/v7.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/v7.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/v7.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big-long.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big-long.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big-long.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big-long.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer-big.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/writer.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/xattrs.tar b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/xattrs.tar similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/xattrs.tar rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/testdata/xattrs.tar diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer.go diff --git a/Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer_test.go b/Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer_test.go rename to Godeps/_workspace/src/github.com/flynn/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar/writer_test.go diff --git a/host/cli/download.go b/host/cli/download.go index 25badd3976..7dd41ee842 100644 --- a/host/cli/download.go +++ b/host/cli/download.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/go-docopt" "github.com/flynn/flynn/pinkerton" "github.com/flynn/flynn/pkg/cliutil" diff --git a/host/cli/ps.go b/host/cli/ps.go index 08caa398a9..88b5214a0f 100644 --- a/host/cli/ps.go +++ b/host/cli/ps.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "time" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/units" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/units" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/go-docopt" "github.com/flynn/flynn/host/types" "github.com/flynn/flynn/pkg/cluster" diff --git a/host/containerinit/init.go b/host/containerinit/init.go index fdad475a60..4843a691f9 100644 --- a/host/containerinit/init.go +++ b/host/containerinit/init.go @@ -31,9 +31,9 @@ import ( "syscall" "time" - sigutil "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/signal" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/user" + sigutil "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/signal" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/kr/pty" "github.com/flynn/flynn/pkg/rpcplus" "github.com/flynn/flynn/pkg/rpcplus/fdrpc" diff --git a/host/libvirt_lxc_backend.go b/host/libvirt_lxc_backend.go index 42d3f9f0d3..72dcbb5802 100644 --- a/host/libvirt_lxc_backend.go +++ b/host/libvirt_lxc_backend.go @@ -20,9 +20,9 @@ import ( "time" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/alexzorin/libvirt-go" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/term" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/term" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/natefinch/lumberjack" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/technoweenie/grohl" "github.com/flynn/flynn/host/containerinit" diff --git a/pinkerton/context.go b/pinkerton/context.go index e2a1db9c10..1029ee42eb 100644 --- a/pinkerton/context.go +++ b/pinkerton/context.go @@ -7,12 +7,12 @@ import ( "net/url" "os" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/aufs" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/btrfs" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/devmapper" - _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver/vfs" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/pkg/reexec" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/aufs" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/btrfs" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/devmapper" + _ "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver/vfs" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/pkg/reexec" "github.com/flynn/flynn/pinkerton/registry" "github.com/flynn/flynn/pinkerton/store" ) diff --git a/pinkerton/store/store.go b/pinkerton/store/store.go index d11ff0322c..80fe965bbe 100644 --- a/pinkerton/store/store.go +++ b/pinkerton/store/store.go @@ -10,7 +10,7 @@ import ( "sync" "syscall" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/graphdriver" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/graphdriver" "github.com/flynn/flynn/pinkerton/registry" ) diff --git a/test/cluster/net.go b/test/cluster/net.go index 8588dcad04..26a9945fe1 100644 --- a/test/cluster/net.go +++ b/test/cluster/net.go @@ -10,8 +10,8 @@ import ( "syscall" "unsafe" - "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/docker/daemon/networkdriver/ipallocator" "github.com/flynn/flynn/Godeps/_workspace/src/github.com/docker/libcontainer/netlink" + "github.com/flynn/flynn/Godeps/_workspace/src/github.com/flynn/docker/daemon/networkdriver/ipallocator" "github.com/flynn/flynn/pkg/iptables" "github.com/flynn/flynn/pkg/random" )