Commit Graph

31995 Commits

Author SHA1 Message Date
R. Tyler Croy 0a7222cb03 Move the built docker binaries into bundles/bin for packaging 2017-09-06 08:20:17 +08:00
R. Tyler Croy 325411c06a GAH MAKE 2017-09-06 07:38:17 +08:00
R. Tyler Croy 1022d26468 Make sure to cd into the checked out git repo 2017-09-06 07:16:08 +08:00
R. Tyler Croy 554f7c1548 Merge pull request #3 from rtyler/freebsd-makefile
Rely on relative paths for checking out additional packages
2017-09-05 16:10:58 -07:00
R. Tyler Croy 46c5c19da0 Rely on relative paths for checking out additional packages
$GOPATH can't be trusted not to have colons in it, and $GOROOT cannot be trusted
to be user writeable. Therefore we'll just rely on the conventional nature of
go packages
2017-09-06 07:10:16 +08:00
R. Tyler Croy cc6924bed6 Merge pull request #2 from rtyler/freebsd-makefile
Introduce a Makefile for building on FreeBSD
2017-09-05 11:35:19 -07:00
R. Tyler Croy 355e785e58 Properly build the containerd binaries and the proxy binaries and drop them in bundles 2017-09-06 02:32:42 +08:00
R. Tyler Croy 9ceed4ab89 Introduce a small GNU/Make shim for building on FreeBSD
Execute via `gmake -f Makefile.freebsd`
2017-09-06 02:07:26 +08:00
R. Tyler Croy 9648f0818f Merge pull request #5 from rtyler/current-17.05
Forward-porting changes for FreeBSD on v17.05.0-ce
2017-09-04 15:25:05 -07:00
R. Tyler Croy 25cb15bc7a Add the remainder of the FreeBSD go files to get the daemon to compile 2017-09-05 06:18:54 +08:00
R Tyler Croy e4e803970b Add a stubbed execSetPlatformOpt for FreeBSD
This is essentially the same thing Solaris has
2017-09-05 05:08:25 +08:00
R Tyler Croy 7e78b15f59 Re-ordering LInux specific functions out of daemon_linux.go 2017-09-05 05:08:25 +08:00
R Tyler Croy 2db2aeeb12 Move the container operations code around to allow stubs on FreeBSD 2017-09-05 05:08:25 +08:00
R. Tyler Croy d737378b34 Add a basic Jenkinsfile 2017-08-24 20:37:23 -07:00
R Tyler Croy 03da82a86f Prevent building the libnetwork bridge driver on non-Linux
Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy 1966b95f79 Remove duplicative definitions of functions in container_notlinux.go
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/container
  .gopath/src/github.com/docker/docker/container/container_unix.go:257: (*Container).SecretMount redeclared in this block
          previous declaration at .gopath/src/github.com/docker/docker/container/container_notlinux.go:16
  .gopath/src/github.com/docker/docker/container/container_unix.go:270: (*Container).UnmountSecrets redeclared in this block
          previous declaration at .gopath/src/github.com/docker/docker/container/container_notlinux.go

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy d9d105446b Vendor my fork of libnetwork at the current HEAD of freebsd-compat-17.05
That branch has the FreeBSD patches picked on top of the 17.05.0-ce vendored
libnetwork commit: 9af8d173c7e95e432e4af19e584e8a9a40a9a054
2017-08-16 10:41:01 +08:00
R Tyler Croy 56e66bcdf4 Re-use the plugin/manager stubs for Solaris on FreeBSD as well
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/plugin
  .gopath/src/github.com/docker/docker/plugin/manager.go:37: pm.restore undefined (type *Manager has no field or method restore)
  .gopath/src/github.com/docker/docker/plugin/manager.go:157: pm.enable undefined (type *Manager has no field or method enable, but does have Enable)
  .gopath/src/github.com/docker/docker/plugin/manager.go:238: pm.enable undefined (type *Manager has no field or method enable, but does have Enable)

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy ed1efb503d Allow libcontainerd to build properly on FreeBSD
This includes some changes where the libcontainer code is simply running the
same stubs that it would have previously been running on Solaris

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy c3c988bc0a Allow libcontainerd/client to build properly on FreeBSD
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/libcontainerd
  .gopath/src/github.com/docker/docker/libcontainerd/process.go:7: undefined: client

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy 0a240a5fe7 VENDOR: Allow tonistiigi/fifo to build properly on FreeBSD
This /might/ cause some issues further down the line, we'll see. But it appears
that some stat_t data structures are differently sized on Linux vs. FreeBSD

  ---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/vendor/github.com/tonistiigi/fifo
  .gopath/src/github.com/docker/docker/vendor/github.com/tonistiigi/fifo/handle_nolinux.go:26: cannot use stat.Ino (type uint32) as type uint64 in field value
  .gopath/src/github.com/docker/docker/vendor/github.com/tonistiigi/fifo/handle_nolinux.go:37: invalid operation: stat.Ino != h.ino (mismatched types uint32 and uint64)

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:01 +08:00
R Tyler Croy 6ee77b5254 Ensure libcontainerd/process_unix builds on FreeBSD
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/libcontainerd
  .gopath/src/github.com/docker/docker/libcontainerd/container.go:11: undefined: process
  .gopath/src/github.com/docker/docker/libcontainerd/container.go:12: undefined: process

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:00 +08:00
R Tyler Croy 43556eb98d VENDOR: Avoid building netlink/filter and correct some invalid function references
# github.com/docker/docker/vendor/github.com/vishvananda/netlink
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/filter.go:189: undefined: nl.TC_U32_TERMINAL
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/filter.go:190: undefined: nl.TC_U32_OFFSET
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/filter.go:191: undefined: nl.TC_U32_VAROFFSET
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/filter.go:192: undefined: nl.TC_U32_EAT

  # github.com/docker/docker/vendor/github.com/vishvananda/netlink
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/handle_unspecified.go:184: undefined: Filter
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/handle_unspecified.go:188: undefined: Filter
  .gopath/src/github.com/docker/docker/vendor/github.com/vishvananda/netlink/handle_unspecified.go:192: undefined: Filter

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:00 +08:00
R Tyler Croy b193b2ac81 Allow libcontainer/container_unix to build on FreeBSD
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/libcontainerd
  .gopath/src/github.com/docker/docker/libcontainerd/client.go:13: undefined: container
  .gopath/src/github.com/docker/docker/libcontainerd/types.go:32: undefined: StateInfo

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:41:00 +08:00
R Tyler Croy d338174102 VENDOR: Ensure dbus/transport_unix.go implements the SendNullByte method
---> Making bundle: binary (in bundles/17.05.0-ce/binary)
  Building: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Created binary: bundles/17.05.0-ce/binary-client/docker-17.05.0-ce
  Building: bundles/17.05.0-ce/binary-daemon/dockerd-17.05.0-ce
  # github.com/docker/docker/libcontainerd
  .gopath/src/github.com/docker/docker/libcontainerd/client.go:13: undefined: container
  .gopath/src/github.com/docker/docker/libcontainerd/types.go:32: undefined: StateInfo
  # github.com/docker/docker/vendor/github.com/godbus/dbus
  .gopath/src/github.com/docker/docker/vendor/github.com/godbus/dbus/transport_unix.go:51: cannot use t (type *unixTransport) as type transport in return argument:
          *unixTransport does not implement transport (missing SendNullByte method)
  .gopath/src/github.com/docker/docker/vendor/github.com/godbus/dbus/transport_unix.go:57: cannot use t (type *unixTransport) as type transport in return argument:
          *unixTransport does not implement transport (missing SendNullByte method)

Signed-off-by: R Tyler Croy <tyler@monkeypox.org>
2017-08-16 10:40:53 +08:00
R. Tyler Croy 0626df2d56
Add a document outlining the current FreeBSD porting progress
Signed-off-by: R. Tyler Croy <tyler@monkeypox.org>
2017-08-15 19:31:04 -07:00
Victor Vieux 89658bed64 bump to GA
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-04 13:56:32 -07:00
Brian Goff d1c9e9cfe9 Ensure unmount before removing local volume.
When there is an error unmounting a local volume, it is still possible
to call `Remove()` on the volume causing removal of the mounted
resources which is generally not desirable.

This ensures that resources are unmounted before attempting removal.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db3576f8a0)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-04 13:56:32 -07:00
Brian Goff c4bd13b650 Use lazy unmount for local volume driver unmount
This fixes issues where the underlying filesystem may be disconnected and
attempting to unmount may cause a hang.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit acbfe6bc56)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-04 13:56:31 -07:00
Victor Vieux 90d35abf7b bump to rc3
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-01 22:49:10 -07:00
Victor Vieux 947cc7b591 Merge pull request #32950 from dnephin/cherry-pick-build-arg-fixes
[17.05.x] Cherry pick build arg fixes
2017-05-01 22:45:51 -07:00
Sebastiaan van Stijn e11e119022 Deprecate "asynchronous" service create and service update
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f32b90f463)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-01 16:42:22 -07:00
Daniel Nephin a4e352ccb0 Fix cache miss when builtin build args are used.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-01 18:20:32 -04:00
Dave Tucker 8c532a6822 builder: Make builtin arg pruning work with > 1 arg
The previous implementation would error out with "Unexpected EOF" which
was caused by an underlying "array index out-of-bounds" error.
The root cause was deleting items from the same array that was being
iterated over. The iteration was unaware that the array size had
changed, resulting in an error.

The new implementation builds a new array instead of mutating a copy of
the old one.

Fixes: #32744

Signed-off-by: Dave Tucker <dt@docker.com>
2017-05-01 18:18:01 -04:00
Harald Albers 9986762bc7 Remove bash completion for `run|create --init-path`
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit b7a32e1780)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-01 15:02:04 -07:00
Victor Vieux 26d3cebaba Merge pull request #32929 from aaronlehmann/vendor-swarmkit-ae52d9d
[17.05] Vendor swarmkit ae52d9d - fix service port publishing regression
2017-05-01 14:54:58 -07:00
Aaron Lehmann bcbfaec7c6 Vendor swarmkit ae52d9d
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-28 18:35:29 -07:00
Aaron Lehmann a3600db8c5 Merge pull request #32905 from dperny/17.05.x-fix-agent-logs-segfault
[17.05.x] Cherry-pick: Fix a rare segfault that can occur in service logs
2017-04-28 18:34:08 -07:00
Drew Erny fa4b810b41 Fix a rare segfault that can occur in service logs
Revendors swarmkit with a change that fixes a rare segfault that can
occur when following logs on a brand new service with bad bind mount
options.

Fixes docker/swarmkit#2147

Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-04-28 11:43:00 -07:00
Victor Vieux c57fdb2a14 bump to rc2
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-26 15:08:31 -07:00
Victor Vieux eaffbcb25d Merge pull request #32848 from aaronlehmann/vendor-swarmkit-78db8a5
[17.05] Vendor swarmkit 78db8a5
2017-04-26 15:07:09 -07:00
Aaron Lehmann 99ad8af0f2 [17.05] Vendor swarmkit 78db8a5
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-26 10:58:25 -07:00
Victor Vieux 8414a0d02e Merge pull request #32819 from aboch/17.05.x
[17.05.x] Vendoring libnetwork @5d4e5de
2017-04-25 17:07:12 -07:00
Antonio Murdaca df996a9581 daemon: relabel secrets path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit b11af7b2f6)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:41:51 -07:00
Aaron Lehmann aea00bf675 client: Allow hex strings as source references for ImageTag
The source of a tag operation is allowed to be a 64-character hex
string. This means it should use ParseAnyReference for validation
instead of ParseNormalizedNamed.

This fixes a regression that happened in 17.04.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 4a0704cdbd)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:41:30 -07:00
Corey Farrell 7e06704af9 Fix bash-completion script.
bash-completion script for 'docker build --network' calls
__docker_plugins, the correct name for this function is
__docker_plugins_bundled.

Closes #32588

Signed-off-by: Corey Farrell <git@cfware.com>
(cherry picked from commit eede2056fe)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:41:14 -07:00
Harald Albers d17b69c5ae Bash completion treats `service logs` as stable
Implements the following new CLI features:
- service logs is no longer experimental
- service logs also accepts task IDs

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 47615c9b9b)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:40:59 -07:00
Brian Goff 2d8ebec4a8 Make sure plugin rootfs is unmounted on upgraded
In some cases, if a user specifies `-f` when disabling a plugin mounts
can still exist on the plugin rootfs.
This can cause problems during upgrade where the rootfs is removed and
may cause data loss.

To resolve this, ensure the rootfs is unmounted
before performing an upgrade.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 83f44d232d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:40:22 -07:00
Antonio Murdaca de8fbb4812 remove --init-path from client
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit a18d103b5e)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-04-25 16:39:55 -07:00
Alessandro Boch dbd2c592df [17.05.x] Vendoring libnetwork @5d4e5de
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-04-25 11:19:51 -07:00