All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy
@ 2018-01-16 21:40 Charles Hardin
  2018-03-10 16:47 ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: Charles Hardin @ 2018-01-16 21:40 UTC (permalink / raw)
  To: buildroot

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>
---
 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)

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy
  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
  2018-03-11  0:15   ` Charles Hardin
  0 siblings, 1 reply; 4+ messages in thread
From: Peter Korsgaard @ 2018-03-10 16:47 UTC (permalink / raw)
  To: buildroot

>>>>> "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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy
  2018-03-10 16:47 ` Peter Korsgaard
@ 2018-03-11  0:15   ` Charles Hardin
  2018-03-11  7:55     ` Peter Korsgaard
  0 siblings, 1 reply; 4+ messages in thread
From: Charles Hardin @ 2018-03-11  0:15 UTC (permalink / raw)
  To: buildroot

It got decoupled go with the other package - it supersedes this one.

Sent from my iPhone

On Mar 10, 2018, at 8:47 AM, Peter Korsgaard <peter@korsgaard.com> wrote:

>>>>>> "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
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/docker-engine: add the macros to install docker-proxy
  2018-03-11  0:15   ` Charles Hardin
@ 2018-03-11  7:55     ` Peter Korsgaard
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2018-03-11  7:55 UTC (permalink / raw)
  To: buildroot

>>>>> "Charles" == Charles Hardin <charles.hardin@storagecraft.com> writes:

 > It got decoupled go with the other package - it supersedes this one.
 > Sent from my iPhone

Ok, I'll mark this patch as superseeded and work on merging Christian's
patch instead.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-11  7:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2018-03-11  0:15   ` Charles Hardin
2018-03-11  7:55     ` Peter Korsgaard

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.