| Message ID | 1464475578-22239-4-git-send-email-christian@paral.in |
|---|---|
| State | Superseded |
| Headers | show |
Christian, Nice work. This opens some interesting possibilities. See comments below. > -----Original Message----- > From: buildroot [mailto:buildroot-bounces@busybox.net] On Behalf Of > Christian Stewart > Sent: Saturday, May 28, 2016 6:46 PM > diff --git a/package/docker-engine/Config.in b/package/docker- > engine/Config.in new file mode 100644 index 0000000..bbf56b1 > --- /dev/null > +++ b/package/docker-engine/Config.in > @@ -0,0 +1,69 @@ > +config BR2_PACKAGE_DOCKER_ENGINE > + bool "docker-engine" > + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_USE_MMU # util-linux > + depends on BR2_USE_WCHAR # util-linux > + select BR2_PACKAGE_DOCKER_CONTAINERD > + select BR2_PACKAGE_RUNC > + select BR2_PACKAGE_SQLITE > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_BINARIES > + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT > + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT > + select BR2_PACKAGE_UTIL_LINUX_MOUNT Does it makes sense to also add selects for BR2_PACKAGE_IPTABLES and BR2_PACKAGE_CA_CERTIFICATES here? They are not build dependencies, but run-time dependencies. It may be possible to do some things without the certificates, but I think iptables is always required. On a similar topic, docker expects a bunch of cgroup mounts to exist somewhere on the system. Is this something that should be left up to the rootfs author (in which case maybe the help could be extended to explain this), or should the docker-engine recipe attempt to modify fstab somehow? I'm not sure if there is a way to actually do that though. > + help > + Docker is a platform to build, ship, > + and run applications as lightweight containers. > + > + https://github.com/docker/docker > + > +comment "docker-engine needs a toolchain w/ threads" > + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_HAS_THREADS This comment should probably be moved to the top so that the items in the below "if" are organized as children of DOCKER_ENGINE in the config GUI's. > + > +if BR2_PACKAGE_DOCKER_ENGINE > + > +config BR2_PACKAGE_DOCKER_ENGINE_DAEMON > + bool "docker daemon" > + default y > + help > + Build the Docker system daemon. > + If not selected, will build client only. > + > +config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL > + bool "build experimental features" > + > +if BR2_PACKAGE_DOCKER_ENGINE_DAEMON > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS > + bool "btrfs filesystem driver" > + depends on BR2_USE_WCHAR # btrfs-progs > + depends on BR2_USE_MMU # btrfs-progs > + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs > + select BR2_PACKAGE_BTRFS_PROGS > + help > + Build the btrfs filesystem driver for Docker. > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER > + bool "devicemapper filesystem driver" > + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 > + depends on BR2_USE_MMU # lvm2 > + depends on !BR2_STATIC_LIBS # lvm2 > + select BR2_PACKAGE_LVM2 > + select BR2_PACKAGE_LVM2_APP_LIBRARY > + help > + Build the devicemapper filesystem driver for Docker. > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS > + bool "vfs filesystem driver" > + depends on BR2_USE_WCHAR # gvfs > + depends on BR2_USE_MMU # gvfs > + depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs > + select BR2_PACKAGE_GVFS > + help > + Build the vfs filesystem driver for Docker. > + > +endif > + > +endif > diff --git a/package/docker-engine/docker-engine.mk b/package/docker- > engine/docker-engine.mk > new file mode 100644 > index 0000000..b7407b2 > --- /dev/null > +++ b/package/docker-engine/docker-engine.mk > @@ -0,0 +1,99 @@ > +######################################################### > ############## > +######### > +# > +# docker-engine > +# > +######################################################### > ############## > +######### > + > +DOCKER_ENGINE_VERSION = v1.11.1 > +DOCKER_ENGINE_SITE = $(call > +github,docker,docker,$(DOCKER_ENGINE_VERSION)) > + > +DOCKER_ENGINE_LICENSE = Apache-2.0 > +DOCKER_ENGINE_LICENSE_FILES = LICENSE > + > +DOCKER_ENGINE_DEPENDENCIES = host-go docker-containerd > + > +DOCKER_ENGINE_GOPATH = "$(@D)/vendor" > +DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ > + CGO_ENABLED=1 \ > + CGO_NO_EMULATION=1 \ > + GOBIN="$(@D)/bin" \ > + GOPATH="$(DOCKER_ENGINE_GOPATH)" > + > +DOCKER_ENGINE_GLDFLAGS = \ > + -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ > + -X main.Version=$(DOCKER_ENGINE_VERSION) \ > + -extldflags '-static' > + > +DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs > + > +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) > +DOCKER_ENGINE_BUILD_TAGS += seccomp > +DOCKER_ENGINE_DEPENDENCIES += libseccomp endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) > +DOCKER_ENGINE_BUILD_TAGS += daemon > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) > +DOCKER_ENGINE_BUILD_TAGS += experimental endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) > +DOCKER_ENGINE_DEPENDENCIES += btrfs-progs else > DOCKER_ENGINE_BUILD_TAGS > ++= exclude_graphdriver_btrfs endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) > +DOCKER_ENGINE_DEPENDENCIES += lvm2 > +else > +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_devicemapper > endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS),y) > +DOCKER_ENGINE_DEPENDENCIES += gvfs > +else > +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs endif > + > +define DOCKER_ENGINE_CONFIGURE_CMDS > + $(SED) '/^clean$$/d' $(@D)/hack/vendor.sh > + cd $(@D) && bash ./hack/vendor.sh > + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker > + ln -fs $(@D) > $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker > + ln -fs $(DOCKER_CONTAINERD_SRCDIR) > $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/containerd > + mkdir -p > $(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers > + ln -fs $(RUNC_SRCDIR) > +$(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers/runc > +endef > + > +define DOCKER_ENGINE_BUILD_CMDS > + cd $(@D); $(DOCKER_ENGINE_MAKE_ENV) $(HOST_DIR)/usr/bin/go > build -v -o > +$(@D)/bin/docker -tags "$(DOCKER_ENGINE_BUILD_TAGS)" -ldflags > +"$(DOCKER_ENGINE_GLDFLAGS)" ./docker endef > + > +define DOCKER_ENGINE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/bin/docker > $(TARGET_DIR)/usr/bin/docker > +endef > + > +define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/docker.service > + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ > + $(TARGET_DIR)/usr/lib/systemd/system/docker.socket > + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi- > user.target.wants/ > + ln -fs ../../../../usr/lib/systemd/system/docker.service \ > + > +$(TARGET_DIR)/etc/systemd/system/multi- > user.target.wants/docker.service > +endef > + > +define DOCKER_ENGINE_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 755 $(@D)/contrib/init/sysvinit-redhat/docker \ > + $(TARGET_DIR)/etc/init.d/S61docker This init file didn't work for me. I'm not sure if it can work on a buildroot filesystem, are you using systemd instead? I removed most of the checks to get it working (actually, I think I started editing the Ubuntu version). Maybe a custom init script is required? I can show you my hack if you like. > + $(INSTALL) -D -m 644 $(@D)/contrib/init/sysvinit- > redhat/docker.sysconfig \ > + $(TARGET_DIR)/etc/sysconfig/docker.sysconfig > +endef > + > +define DOCKER_ENGINE_USERS > + - - docker -1 * - - - Docker Application Container Framework endef > + > +$(eval $(generic-package)) Andrew
Hello, Thanks for your feedback. However, it'd be nice if you could configure your e-mail client to wrap lines at a reasonable length. On Tue, 7 Jun 2016 19:43:53 +0000, Andrew Webster wrote: > Does it makes sense to also add selects for BR2_PACKAGE_IPTABLES and > BR2_PACKAGE_CA_CERTIFICATES here? They are not build dependencies, > but run-time dependencies. It may be possible to do some things > without the certificates, but I think iptables is always required. It is indeed a good idea to select the relevant runtime dependencies. > On a similar topic, docker expects a bunch of cgroup mounts to exist > somewhere on the system. Is this something that should be left up to > the rootfs author (in which case maybe the help could be extended to > explain this), or should the docker-engine recipe attempt to modify > fstab somehow? I'm not sure if there is a way to actually do that > though. The Buildroot philosophy is in general that things should work at least in a minimal way "out of the box". So if cgroup mounts are needed for Docker, they should be done in Docker's init script. > > +define DOCKER_ENGINE_INSTALL_INIT_SYSV > > + $(INSTALL) -D -m 755 > > $(@D)/contrib/init/sysvinit-redhat/docker \ > > + $(TARGET_DIR)/etc/init.d/S61docker > > This init file didn't work for me. I'm not sure if it can work on a > buildroot filesystem, are you using systemd instead? I removed most > of the checks to get it working (actually, I think I started editing > the Ubuntu version). Maybe a custom init script is required? I can > show you my hack if you like. Very often, init scripts provided by upstream for desktop/server distributions don't work really well with Buildroot generated systems. Because we don't have bash by default, because we don't necessarily have all the tools they need in our default image, and for various other reasons. That's why we generally have our own Buildroot-specific init script in the package directory. So a custom init script is probably in order here, especially if you report that the one provided by upstream doesn't quite work. Thanks! Thomas
> From: Thomas Petazzoni [mailto:thomas.petazzoni@free-electrons.com] > Sent: Tuesday, June 07, 2016 3:55 PM > Thanks for your feedback. However, it'd be nice if you could configure your e-mail client to wrap lines at a reasonable length. Sorry, I just noticed that. It's also mangling some of the incoming text as well. I'll try and figure that out. > > On a similar topic, docker expects a bunch of cgroup mounts to exist > > somewhere on the system. Is this something that should be left up to > > the rootfs author (in which case maybe the help could be extended to > > explain this), or should the docker-engine recipe attempt to modify > > fstab somehow? I'm not sure if there is a way to actually do that > > though. > > The Buildroot philosophy is in general that things should work at least in a minimal way "out of the box". So if cgroup mounts are > needed for Docker, they should be done in Docker's init script. Ahh, right. I missed that part when I made my custom init. The debian/redhat versions do attempt to do this.
Thomas, Andrew, On Tue, Jun 7, 2016 at 12:54 PM, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > > > Does it makes sense to also add selects for BR2_PACKAGE_IPTABLES and > > BR2_PACKAGE_CA_CERTIFICATES here? They are not build dependencies, > > but run-time dependencies. It may be possible to do some things > > without the certificates, but I think iptables is always required. > Not sure if these are actually required. The iptables calls are direct, not through calling a cli. Certs are a different story but that might be out of the scope of the Docker package. It can run stuff locally without hitting the internet at all. > On a similar topic, docker expects a bunch of cgroup mounts to exist > > somewhere on the system. Is this something that should be left up to > > the rootfs author (in which case maybe the help could be extended to > > explain this), or should the docker-engine recipe attempt to modify > > fstab somehow? I'm not sure if there is a way to actually do that > > though. > This is unnecessary. On all of the systems I'm running, with NO fstab modifications or really anything but enabling the Docker package, it works fine. Docker might be doing the mounting automatically. > > +define DOCKER_ENGINE_INSTALL_INIT_SYSV > > > + $(INSTALL) -D -m 755 > > > $(@D)/contrib/init/sysvinit-redhat/docker \ > > > + $(TARGET_DIR)/etc/init.d/S61docker > > > > This init file didn't work for me. I'm not sure if it can work on a > > buildroot filesystem, are you using systemd instead? I removed most > > of the checks to get it working (actually, I think I started editing > > the Ubuntu version). Maybe a custom init script is required? I can > > show you my hack if you like. > I didn't expect this to work, and was hoping someone who's not using systemd would contribute a better init script for it. I'd appreciate seeing your script if you manage to get one that works well for you under Buildroot's shell based init sequence. So a custom init script is probably in order here, especially if you > report that the one provided by upstream doesn't quite work. > +1 For reference, here's my system setup: http://github.com/paralin/SkiffOS It's actually a very extensible configuration generation platform, I'm hoping to expand its scope soon, if anyone would like to have a look and give me any comments, they would be greatly appreciated :) Thanks! Christian Stewart
> From: Christian Stewart [mailto:christian@paral.in] > Sent: Tuesday, June 07, 2016 4:18 PM > > Does it makes sense to also add selects for BR2_PACKAGE_IPTABLES and > > BR2_PACKAGE_CA_CERTIFICATES here? They are not build dependencies, > > but run-time dependencies. It may be possible to do some things > > without the certificates, but I think iptables is always required. > Not sure if these are actually required. The iptables calls are direct, not through calling a cli. On my system, if I don't have the iptables executable in the path, docker fails to start with the following: FATA[0001] Error starting daemon: Error initializing network controller: error obtaining controller instance: failed to create NAT chain: Iptables not found Have I misconfigured something? > Certs are a different story but that might be out of the scope of the Docker package. It can run stuff locally without hitting the internet at all. Yup. I guess there's no formal way to "recommend" a package. > > On a similar topic, docker expects a bunch of cgroup mounts to exist > > somewhere on the system. Is this something that should be left up to > > the rootfs author (in which case maybe the help could be extended to > > explain this), or should the docker-engine recipe attempt to modify > > fstab somehow? I'm not sure if there is a way to actually do that > > though. > This is unnecessary. On all of the systems I'm running, with NO fstab modifications or really anything but enabling the Docker package, it works fine. Docker might be doing the mounting automatically. You are correct. This was my fault, I missed doing the mounts in the init. Let me correct it, then I'll send it out. Andrew
Hello, On Tue, 7 Jun 2016 20:37:51 +0000, Andrew Webster wrote: > > Certs are a different story but that might be out of the scope of > > the Docker package. It can run stuff locally without hitting the > > internet at all. > > Yup. I guess there's no formal way to "recommend" a package. The best thing we can do in the context of Buildroot is to add a note in the help text of the package in its Config.in file. Something like: Make sure to enable the ca-certificates package if you want docker-engine to be able to .... Best regards, Thomas
Hi Christian, Le 29/05/2016 à 00:46, Christian Stewart a écrit : > Docker is a platform to build, ship, and run applications in portable > containers. > > Signed-off-by: Christian Stewart <christian@paral.in> > > --- > > Changes since v1: > - use call github to build source URL > Changes since v3: > - fix help indentation in Config.in > - use HOST_GO_TARGET_ENV as a base for build env vars > - cleanup build commands > - cleanup GOPATH and vendor directory setup > - Remove selections for graph drivers. Docker will gracefully degrade > at runtime to the best available graphdriver. It is unnecessary to > disable these at build time, or to pull in any other dependencies > like aufs-util or btrfs tools. The daemon will use whatever is > available at runtime. > Changes since v4: > - remove commit hash from version scheme > Changes since v5: > - re-introduce graphdriver selections > - these selections are required for btrfs and devicemapper > - there are buildtime dependencies on headers. > - add BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS dep to threading comment > > --- > package/Config.in | 1 + > package/docker-engine/Config.in | 69 ++++++++++++++++++++++ > package/docker-engine/docker-engine.hash | 2 + > package/docker-engine/docker-engine.mk | 99 ++++++++++++++++++++++++++++++++ > 4 files changed, 171 insertions(+) > create mode 100644 package/docker-engine/Config.in > create mode 100644 package/docker-engine/docker-engine.hash > create mode 100644 package/docker-engine/docker-engine.mk > > diff --git a/package/Config.in b/package/Config.in > index c8365f8..b829075 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1632,6 +1632,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > source "package/debianutils/Config.in" > endif > source "package/docker-containerd/Config.in" > + source "package/docker-engine/Config.in" > source "package/cgroupfs-mount/Config.in" > source "package/dsp-tools/Config.in" > source "package/emlog/Config.in" > diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in > new file mode 100644 > index 0000000..bbf56b1 > --- /dev/null > +++ b/package/docker-engine/Config.in > @@ -0,0 +1,69 @@ > +config BR2_PACKAGE_DOCKER_ENGINE > + bool "docker-engine" > + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_USE_MMU # util-linux > + depends on BR2_USE_WCHAR # util-linux > + select BR2_PACKAGE_DOCKER_CONTAINERD > + select BR2_PACKAGE_RUNC > + select BR2_PACKAGE_SQLITE > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_BINARIES > + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT > + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT > + select BR2_PACKAGE_UTIL_LINUX_MOUNT > + help > + Docker is a platform to build, ship, > + and run applications as lightweight containers. > + > + https://github.com/docker/docker > + > +comment "docker-engine needs a toolchain w/ threads" > + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_HAS_THREADS > + > +if BR2_PACKAGE_DOCKER_ENGINE > + > +config BR2_PACKAGE_DOCKER_ENGINE_DAEMON > + bool "docker daemon" > + default y > + help > + Build the Docker system daemon. > + If not selected, will build client only. > + > +config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL > + bool "build experimental features" > + > +if BR2_PACKAGE_DOCKER_ENGINE_DAEMON > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS > + bool "btrfs filesystem driver" > + depends on BR2_USE_WCHAR # btrfs-progs > + depends on BR2_USE_MMU # btrfs-progs > + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs > + select BR2_PACKAGE_BTRFS_PROGS > + help > + Build the btrfs filesystem driver for Docker. > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER > + bool "devicemapper filesystem driver" > + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 > + depends on BR2_USE_MMU # lvm2 > + depends on !BR2_STATIC_LIBS # lvm2 > + select BR2_PACKAGE_LVM2 > + select BR2_PACKAGE_LVM2_APP_LIBRARY > + help > + Build the devicemapper filesystem driver for Docker. > + > +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS > + bool "vfs filesystem driver" > + depends on BR2_USE_WCHAR # gvfs > + depends on BR2_USE_MMU # gvfs > + depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs > + select BR2_PACKAGE_GVFS > + help > + Build the vfs filesystem driver for Docker. > + > +endif > + > +endif > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > new file mode 100644 > index 0000000..7b93669 > --- /dev/null > +++ b/package/docker-engine/docker-engine.hash > @@ -0,0 +1,2 @@ > +# Locally calculated > +sha256 04de3750738b6f888f03520fb67db22e95e8a8e016ae901428e6c5791c9841cc docker-engine-v1.11.1.tar.gz > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > new file mode 100644 > index 0000000..b7407b2 > --- /dev/null > +++ b/package/docker-engine/docker-engine.mk > @@ -0,0 +1,99 @@ > +################################################################################ > +# > +# docker-engine > +# > +################################################################################ > + > +DOCKER_ENGINE_VERSION = v1.11.1 > +DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) > + > +DOCKER_ENGINE_LICENSE = Apache-2.0 > +DOCKER_ENGINE_LICENSE_FILES = LICENSE > + > +DOCKER_ENGINE_DEPENDENCIES = host-go docker-containerd > + > +DOCKER_ENGINE_GOPATH = "$(@D)/vendor" > +DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ > + CGO_ENABLED=1 \ > + CGO_NO_EMULATION=1 \ > + GOBIN="$(@D)/bin" \ > + GOPATH="$(DOCKER_ENGINE_GOPATH)" > + > +DOCKER_ENGINE_GLDFLAGS = \ > + -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ > + -X main.Version=$(DOCKER_ENGINE_VERSION) \ > + -extldflags '-static' > + > +DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs > + > +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) > +DOCKER_ENGINE_BUILD_TAGS += seccomp > +DOCKER_ENGINE_DEPENDENCIES += libseccomp > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) > +DOCKER_ENGINE_BUILD_TAGS += daemon > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) > +DOCKER_ENGINE_BUILD_TAGS += experimental > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) > +DOCKER_ENGINE_DEPENDENCIES += btrfs-progs > +else > +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_btrfs > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) > +DOCKER_ENGINE_DEPENDENCIES += lvm2 > +else > +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_devicemapper > +endif > + > +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS),y) > +DOCKER_ENGINE_DEPENDENCIES += gvfs > +else > +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs > +endif > + > +define DOCKER_ENGINE_CONFIGURE_CMDS > + $(SED) '/^clean$$/d' $(@D)/hack/vendor.sh > + cd $(@D) && bash ./hack/vendor.sh This script clone dozen git repository github.com/Azure/go-ansiterm github.com/Microsoft/hcsshim github.com/Microsoft/go-winio github.com/Sirupsen/logrus github.com/docker/libtrust github.com/go-check/check github.com/gorilla/context github.com/gorilla/mux github.com/kr/pty github.com/mattn/go-shellwords github.com/mattn/go-sqlite3 github.com/mistifyio/go-zfs github.com/tchap/go-patricia github.com/vdemeester/shakers golang.org/x/net golang.org/x/sys github.com/docker/go-units github.com/docker/go-connections github.com/docker/engine-api github.com/RackSec/srslog github.com/imdario/mergo github.com/docker/libnetwork github.com/armon/go-metrics github.com/hashicorp/go-msgpack github.com/hashicorp/memberlist github.com/hashicorp/serf github.com/docker/libkv github.com/vishvananda/netns github.com/vishvananda/netlink github.com/BurntSushi/toml github.com/samuel/go-zookeeper github.com/deckarep/golang-set github.com/coreos/etcd github.com/ugorji/go github.com/hashicorp/consul github.com/boltdb/bolt github.com/miekg/dns github.com/docker/distribution github.com/vbatts/tar-split github.com/docker/notary google.golang.org/grpc github.com/miekg/pkcs11 github.com/docker/go github.com/agl/ed25519 github.com/opencontainers/runc github.com/opencontainers/specs github.com/seccomp/libseccomp-golang github.com/coreos/go-systemd github.com/godbus/dbus github.com/syndtr/gocapability github.com/golang/protobuf github.com/Graylog2/go-gelf github.com/fluent/fluent-logger-golang github.com/philhofer/fwd github.com/tinylib/msgp gopkg.in/fsnotify.v1 github.com/aws/aws-sdk-go github.com/vaughan0/go-ini golang.org/x/oauth2 google.golang.org/api google.golang.org/cloud github.com/docker/containerd You probably needs to add theses packages to Buildroot first and then fix docker-engine build system. Best regards, Romain > + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker > + ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker > + ln -fs $(DOCKER_CONTAINERD_SRCDIR) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/containerd > + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers > + ln -fs $(RUNC_SRCDIR) $(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers/runc > +endef > + > +define DOCKER_ENGINE_BUILD_CMDS > + cd $(@D); $(DOCKER_ENGINE_MAKE_ENV) $(HOST_DIR)/usr/bin/go build -v -o $(@D)/bin/docker -tags "$(DOCKER_ENGINE_BUILD_TAGS)" -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" ./docker > +endef > + > +define DOCKER_ENGINE_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/bin/docker $(TARGET_DIR)/usr/bin/docker > +endef > + > +define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ > + $(TARGET_DIR)/usr/lib/systemd/system/docker.service > + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ > + $(TARGET_DIR)/usr/lib/systemd/system/docker.socket > + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ > + ln -fs ../../../../usr/lib/systemd/system/docker.service \ > + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service > +endef > + > +define DOCKER_ENGINE_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 755 $(@D)/contrib/init/sysvinit-redhat/docker \ > + $(TARGET_DIR)/etc/init.d/S61docker > + $(INSTALL) -D -m 644 $(@D)/contrib/init/sysvinit-redhat/docker.sysconfig \ > + $(TARGET_DIR)/etc/sysconfig/docker.sysconfig > +endef > + > +define DOCKER_ENGINE_USERS > + - - docker -1 * - - - Docker Application Container Framework > +endef > + > +$(eval $(generic-package)) >
Romain, On Mon, Jul 4, 2016, 9:13 AM Romain Naour <romain.naour@gmail.com> wrote: > This script clone dozen git repository > That script is unnecessary and I have removed it in my newer version of this series. It's intended to be called by developers to update the vendor tree, not at build time. Christian >
Le 04/07/2016 à 18:16, Christian Stewart a écrit : > Romain, > > On Mon, Jul 4, 2016, 9:13 AM Romain Naour <romain.naour@gmail.com > <mailto:romain.naour@gmail.com>> wrote: > > This script clone dozen git repository > > > That script is unnecessary and I have removed it in my newer version of this > series. It's intended to be called by developers to update the vendor tree, not > at build time. Ok, great. You had some review on patch 2 and 3, I'll mark the series changes requested in the patchwork. Please, don't forget to send an updated version. Thanks! Best regards, Romain > > Christian >
diff --git a/package/Config.in b/package/Config.in index c8365f8..b829075 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1632,6 +1632,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/debianutils/Config.in" endif source "package/docker-containerd/Config.in" + source "package/docker-engine/Config.in" source "package/cgroupfs-mount/Config.in" source "package/dsp-tools/Config.in" source "package/emlog/Config.in" diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in new file mode 100644 index 0000000..bbf56b1 --- /dev/null +++ b/package/docker-engine/Config.in @@ -0,0 +1,69 @@ +config BR2_PACKAGE_DOCKER_ENGINE + bool "docker-engine" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # util-linux + depends on BR2_USE_WCHAR # util-linux + select BR2_PACKAGE_DOCKER_CONTAINERD + select BR2_PACKAGE_RUNC + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_BINARIES + select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT + select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT + select BR2_PACKAGE_UTIL_LINUX_MOUNT + help + Docker is a platform to build, ship, + and run applications as lightweight containers. + + https://github.com/docker/docker + +comment "docker-engine needs a toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS + +if BR2_PACKAGE_DOCKER_ENGINE + +config BR2_PACKAGE_DOCKER_ENGINE_DAEMON + bool "docker daemon" + default y + help + Build the Docker system daemon. + If not selected, will build client only. + +config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL + bool "build experimental features" + +if BR2_PACKAGE_DOCKER_ENGINE_DAEMON + +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS + bool "btrfs filesystem driver" + depends on BR2_USE_WCHAR # btrfs-progs + depends on BR2_USE_MMU # btrfs-progs + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs + select BR2_PACKAGE_BTRFS_PROGS + help + Build the btrfs filesystem driver for Docker. + +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER + bool "devicemapper filesystem driver" + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on BR2_USE_MMU # lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_LVM2_APP_LIBRARY + help + Build the devicemapper filesystem driver for Docker. + +config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS + bool "vfs filesystem driver" + depends on BR2_USE_WCHAR # gvfs + depends on BR2_USE_MMU # gvfs + depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs + select BR2_PACKAGE_GVFS + help + Build the vfs filesystem driver for Docker. + +endif + +endif diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash new file mode 100644 index 0000000..7b93669 --- /dev/null +++ b/package/docker-engine/docker-engine.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 04de3750738b6f888f03520fb67db22e95e8a8e016ae901428e6c5791c9841cc docker-engine-v1.11.1.tar.gz diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk new file mode 100644 index 0000000..b7407b2 --- /dev/null +++ b/package/docker-engine/docker-engine.mk @@ -0,0 +1,99 @@ +################################################################################ +# +# docker-engine +# +################################################################################ + +DOCKER_ENGINE_VERSION = v1.11.1 +DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) + +DOCKER_ENGINE_LICENSE = Apache-2.0 +DOCKER_ENGINE_LICENSE_FILES = LICENSE + +DOCKER_ENGINE_DEPENDENCIES = host-go docker-containerd + +DOCKER_ENGINE_GOPATH = "$(@D)/vendor" +DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + CGO_ENABLED=1 \ + CGO_NO_EMULATION=1 \ + GOBIN="$(@D)/bin" \ + GOPATH="$(DOCKER_ENGINE_GOPATH)" + +DOCKER_ENGINE_GLDFLAGS = \ + -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ + -X main.Version=$(DOCKER_ENGINE_VERSION) \ + -extldflags '-static' + +DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +DOCKER_ENGINE_BUILD_TAGS += seccomp +DOCKER_ENGINE_DEPENDENCIES += libseccomp +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) +DOCKER_ENGINE_BUILD_TAGS += daemon +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) +DOCKER_ENGINE_BUILD_TAGS += experimental +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) +DOCKER_ENGINE_DEPENDENCIES += btrfs-progs +else +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_btrfs +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) +DOCKER_ENGINE_DEPENDENCIES += lvm2 +else +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_devicemapper +endif + +ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS),y) +DOCKER_ENGINE_DEPENDENCIES += gvfs +else +DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs +endif + +define DOCKER_ENGINE_CONFIGURE_CMDS + $(SED) '/^clean$$/d' $(@D)/hack/vendor.sh + cd $(@D) && bash ./hack/vendor.sh + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker + ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker + ln -fs $(DOCKER_CONTAINERD_SRCDIR) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/containerd + mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers + ln -fs $(RUNC_SRCDIR) $(DOCKER_ENGINE_GOPATH)/src/github.com/opencontainers/runc +endef + +define DOCKER_ENGINE_BUILD_CMDS + cd $(@D); $(DOCKER_ENGINE_MAKE_ENV) $(HOST_DIR)/usr/bin/go build -v -o $(@D)/bin/docker -tags "$(DOCKER_ENGINE_BUILD_TAGS)" -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" ./docker +endef + +define DOCKER_ENGINE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/docker $(TARGET_DIR)/usr/bin/docker +endef + +define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ + $(TARGET_DIR)/usr/lib/systemd/system/docker.service + $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/docker.socket + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ + ln -fs ../../../../usr/lib/systemd/system/docker.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service +endef + +define DOCKER_ENGINE_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 $(@D)/contrib/init/sysvinit-redhat/docker \ + $(TARGET_DIR)/etc/init.d/S61docker + $(INSTALL) -D -m 644 $(@D)/contrib/init/sysvinit-redhat/docker.sysconfig \ + $(TARGET_DIR)/etc/sysconfig/docker.sysconfig +endef + +define DOCKER_ENGINE_USERS + - - docker -1 * - - - Docker Application Container Framework +endef + +$(eval $(generic-package))
Docker is a platform to build, ship, and run applications in portable containers. Signed-off-by: Christian Stewart <christian@paral.in> --- Changes since v1: - use call github to build source URL Changes since v3: - fix help indentation in Config.in - use HOST_GO_TARGET_ENV as a base for build env vars - cleanup build commands - cleanup GOPATH and vendor directory setup - Remove selections for graph drivers. Docker will gracefully degrade at runtime to the best available graphdriver. It is unnecessary to disable these at build time, or to pull in any other dependencies like aufs-util or btrfs tools. The daemon will use whatever is available at runtime. Changes since v4: - remove commit hash from version scheme Changes since v5: - re-introduce graphdriver selections - these selections are required for btrfs and devicemapper - there are buildtime dependencies on headers. - add BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS dep to threading comment --- package/Config.in | 1 + package/docker-engine/Config.in | 69 ++++++++++++++++++++++ package/docker-engine/docker-engine.hash | 2 + package/docker-engine/docker-engine.mk | 99 ++++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 package/docker-engine/Config.in create mode 100644 package/docker-engine/docker-engine.hash create mode 100644 package/docker-engine/docker-engine.mk