package/docker-engine: add the macros to install docker-proxy

PATCH New Charles Hardin 3 participants 4 messages Jan 16, 2018 – Mar 11, 2018

Share & tools

Charles Hardin

author

2018-01-16 21:40 UTC #0 lore raw

PATCH 1/1 package/docker-engine: add the macros to install docker-proxy

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 <[email protected]>

---
 package/docker-engine/docker-engine.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

package/docker-engine/docker-engine.mk +16 -0

index 8928f072e7..94552b1201 100644
@@ -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))

Signature · 1 line

2.14.3 (Apple Git-98)

Peter Korsgaard

2018-03-10 16:47 UTC #1 lore raw

PATCH 1/1 package/docker-engine: add the macros to install docker-proxy

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Charles" == Charles Hardin <[email protected]> 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 <[email protected]>

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?

Quoted 51 lines

---
 package/docker-engine/docker-engine.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

package/docker-engine/docker-engine.mk +16 -0

index 8928f072e7..94552b1201 100644
@@ -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))

Signature · 6 lines

2.14.3 (Apple Git-98)

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 1 line

Bye, Peter Korsgaard

Charles Hardin

2018-03-11 00:15 UTC #2 lore raw

PATCH 1/1 package/docker-engine: add the macros to install docker-proxy

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

Sent from my iPhone

Quoted 71 lines · Peter Korsgaard

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Charles" == Charles Hardin <[email protected]> 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 <[email protected]>
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?
Quoted 51 lines
---
package/docker-engine/docker-engine.mk | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
package/docker-engine/docker-engine.mk +14 -0
index 8928f072e7..94552b1201 100644
@@ -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
package/docker-engine/docker-engine.mk +1 -0
@@ -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))
Signature · 6 lines
2.14.3 (Apple Git-98)

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard

Peter Korsgaard

2018-03-11 07:55 UTC #3 lore raw

PATCH 1/1 package/docker-engine: add the macros to install docker-proxy

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Charles" == Charles Hardin <[email protected]> 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.

Signature · 1 line

Bye, Peter Korsgaard