From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy
Date: Sat, 10 Mar 2018 17:47:00 +0100 [thread overview]
Message-ID: <87zi3fc1yz.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20180116214046.10605-1-charles.hardin@storagecraft.com> (Charles Hardin's message of "Tue, 16 Jan 2018 13:40:46 -0800")
>>>>> "Charles" == Charles Hardin <ckhardin@exablox.com> writes:
> During the bringup of some of the network within the containers,
> an error was show about missing the docker-proxy - so, add the
> definitions to build the proxy
> Signed-off-by: Charles Hardin <charles.hardin@storagecraft.com>
Hmm, but is libnetwork bundled with the docker-engine 17.05.0-ce git
repo? Christian Stewart recently contributed a patch for docker-proxy
where it gets downloaded and built separately from docker-engine:
http://lists.busybox.net/pipermail/buildroot/2018-March/214923.html
What are the pro/cons here?
> ---
> package/docker-engine/docker-engine.mk | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
> diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
> index 8928f072e7..94552b1201 100644
> --- a/package/docker-engine/docker-engine.mk
> +++ b/package/docker-engine/docker-engine.mk
> @@ -87,6 +87,20 @@ endef
> ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
> +define DOCKER_ENGINE_BUILD_PROXY
> + cd $(@D)/gopath/src/github.com/docker/docker; \
> + $(DOCKER_ENGINE_MAKE_ENV) \
> + $(HOST_DIR)/bin/go build -v \
> + -o $(@D)/bin/docker-proxy \
> + -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
> + -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
> + github.com/docker/libnetwork/cmd/proxy
> +endef
> +
> +define DOCKER_ENGINE_INSTALL_PROXY
> + $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy
> +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
> @@ -113,12 +127,14 @@ define DOCKER_ENGINE_BUILD_CMDS
> -ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
> github.com/docker/docker/cmd/$(target)
> )
> + $(DOCKER_ENGINE_BUILD_PROXY)
> endef
> define DOCKER_ENGINE_INSTALL_TARGET_CMDS
> $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
> $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target)
> )
> + $(DOCKER_ENGINE_INSTALL_PROXY)
> endef
> $(eval $(generic-package))
> --
> 2.14.3 (Apple Git-98)
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2018-03-10 16:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 21:40 [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy Charles Hardin
2018-03-10 16:47 ` Peter Korsgaard [this message]
2018-03-11 0:15 ` Charles Hardin
2018-03-11 7:55 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zi3fc1yz.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.