4 files changed, 34 insertions, 51 deletions

diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 0dfda5f1..7a418508 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -18,15 +18,12 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "0520e243029d1361649afb0706a1c5d9a1c012b8"
-SRCREV_libnetwork = "4cb38c2987c236dce03c868d99b57b1e28a4b81c"
-SRCREV_cli = "0f1bb353423e45e02315e985bd9ddebe6da18457"
+SRCREV_docker = "6e632f7fc395d15bce46f426086e91c01598cf59"
+SRCREV_libnetwork = "6da50d1978302f04c3e2089e29112ea24812f05b"
 SRC_URI = "\
-        git://github.com/docker/docker-ce.git;nobranch=1;name=docker \
-        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork \
-        git://github.com/docker/cli;branch=master;name=cli;destsuffix=cli \
+        git://github.com/docker/docker-ce.git;branch=18.09;name=docker \
+        git://github.com/docker/libnetwork.git;branch=bump_18.09;name=libnetwork;destsuffix=git/libnetwork \
         file://docker.init \
-        file://hi.Dockerfile \
         "
 
 # Apache-2.0 for docker
@@ -37,7 +34,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "18.03.0-ce"
+DOCKER_VERSION = "18.09.0-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 DEPENDS = " \
@@ -92,8 +89,8 @@ do_compile() {
         ln -sf ../../../../components/engine/ .gopath/src/"${DOCKER_PKG}"
 
         mkdir -p .gopath/src/github.com/docker
-        ln -sf ${WORKDIR}/libnetwork .gopath/src/github.com/docker/libnetwork
-        ln -sf ${WORKDIR}/cli .gopath/src/github.com/docker/cli
+        ln -sf ${WORKDIR}/git/libnetwork .gopath/src/github.com/docker/libnetwork
+        ln -sf ${S}/src/import/components/cli .gopath/src/github.com/docker/cli
 
         export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
         export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
@@ -111,17 +108,17 @@ do_compile() {
 
         cd ${S}/src/import/components/engine
 
-        # this is the unsupported built structure
+        # this is the unsupported build structure
         # that doesn't rely on an existing docker
         # to build this:
         VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_docker}" ./hack/make.sh dynbinary
 
         # build the proxy
-        go build -o ${S}/src/import/docker-proxy github.com/docker/libnetwork/cmd/proxy
+        cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork
+        oe_runmake cross-local
 
         # build the cli
-        ##go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker github.com/docker/cli/cmd/docker
-        cd ${S}/src/import/.gopath/src/github.com/docker/cli
+        cd ${S}/src/import/components/cli
         export CFLAGS=""
         export LDFLAGS=""
         export DOCKER_VERSION=${DOCKER_VERSION}
@@ -130,7 +127,6 @@ do_compile() {
 
 SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
 SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}"
-
 SYSTEMD_AUTO_ENABLE_${PN} = "enable"
 
 INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
@@ -139,9 +135,9 @@ INITSCRIPT_PARAMS_${PN} = "defaults"
 
 do_install() {
         mkdir -p ${D}/${bindir}
-        cp ${WORKDIR}/cli/build/docker ${D}/${bindir}/docker
+        cp ${S}/src/import/components/cli/build/docker ${D}/${bindir}/docker
         cp ${S}/src/import/components/engine/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
-        cp ${S}/src/import/docker-proxy ${D}/${bindir}/docker-proxy
+        cp ${WORKDIR}/git/libnetwork/bin/docker-proxy* ${D}/${bindir}/docker-proxy
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
                 install -d ${D}${systemd_unitdir}/system
@@ -154,7 +150,6 @@ do_install() {
         fi
 
         mkdir -p ${D}${datadir}/docker/
-        cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/
         install -m 0755 ${S}/src/import/components/engine/contrib/check-config.sh ${D}${datadir}/docker/
 }
 
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index b3673d43..f63cee16 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,27 +18,26 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "708b068d3095c6a6be939eb2da78c921d2e945e2"
-SRCREV_libnetwork = "4cb38c2987c236dce03c868d99b57b1e28a4b81c"
-SRCREV_cli = "0f1bb353423e45e02315e985bd9ddebe6da18457"
+SRCREV_docker = "489b8eda6674523df8b82a210399b7d2954427d0"
+SRCREV_libnetwork = "6da50d1978302f04c3e2089e29112ea24812f05b"
+SRCREV_cli = "51668a30f26250ccfce31bcc13d9334eaafabe36"
 SRC_URI = "\
         git://github.com/moby/moby.git;nobranch=1;name=docker \
-        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
-        git://github.com/docker/cli;branch=master;name=cli;destsuffix=git/cli \
+        git://github.com/docker/libnetwork.git;branch=bump_18.09;name=libnetwork;destsuffix=git/libnetwork \
+        git://github.com/docker/cli;branch=18.09;name=cli;destsuffix=git/cli \
         file://docker.init \
-        file://hi.Dockerfile \
         file://0001-libnetwork-use-GO-instead-of-go.patch \
         "
 
 # Apache-2.0 for docker
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=9740d093a080530b5c5c6573df9af45a"
+LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=4859e97a9c7780e77972d989f0823f28"
 
 GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "18.03.0"
+DOCKER_VERSION = "18.09.0"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 DEPENDS = " \
@@ -157,7 +156,6 @@ do_install() {
         fi
 
         mkdir -p ${D}${datadir}/docker/
-        cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/
         install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/
 }
 
diff --git a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
index 61ddd26d..c623b260 100644
--- a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
+++ b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
@@ -11,24 +11,24 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
  Makefile | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/libnetwork/Makefile b/libnetwork/Makefile
-index 17060bc212c7..90cc7a72ef45 100644
---- a/libnetwork/Makefile
-+++ b/libnetwork/Makefile
-@@ -26,9 +26,9 @@ build: ${build_image}.created
+Index: git/libnetwork/Makefile
+===================================================================
+--- git.orig/libnetwork/Makefile
++++ git/libnetwork/Makefile
+@@ -45,9 +45,9 @@
  build-local:
         @echo "🐳 $@"
         @mkdir -p "bin"
 -       go build -tags experimental -o "bin/dnet" ./cmd/dnet
 -       go build -o "bin/docker-proxy" ./cmd/proxy
--       GOOS=linux go build -o "./cmd/diagnostic/diagnosticClient" ./cmd/diagnostic
+-       CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic
 +       $(GO) build -tags experimental -o "bin/dnet" ./cmd/dnet
 +       $(GO) build -o "bin/proxy" ./cmd/proxy
-+       GOOS=linux $(GO) build -o "./cmd/diagnostic/diagnosticClient" ./cmd/diagnostic
++       CGO_ENABLED=0 $(GO) build -o "bin/diagnosticClient" ./cmd/diagnostic
+        CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
  
- clean:
-        @echo "🐳 $@"
-@@ -51,8 +51,8 @@ cross: ${build_image}.created
+ build-images:
+@@ -82,8 +82,8 @@
  
  cross-local:
         @echo "🐳 $@"
@@ -37,9 +37,9 @@ index 17060bc212c7..90cc7a72ef45 100644
 +       @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
 +       @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
  
- check: ${build_image}.created
-        @${docker} ./wrapmake.sh check-local
-@@ -68,7 +68,7 @@ run-tests:
+ # Rebuild protocol buffers.
+ # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt.
+@@ -130,7 +130,7 @@
         if ls $$dir/*.go &> /dev/null; then \
                 pushd . &> /dev/null ; \
                 cd $$dir ; \
@@ -48,7 +48,7 @@ index 17060bc212c7..90cc7a72ef45 100644
                 ret=$$? ;\
                 if [ $$ret -ne 0 ]; then exit $$ret; fi ;\
                 popd &> /dev/null; \
-@@ -94,7 +94,7 @@ coveralls:
+@@ -145,7 +145,7 @@
  # Depends on binaries because vet will silently fail if it can not load compiled imports
  vet: ## run go vet
         @echo "🐳 $@"
@@ -57,6 +57,3 @@ index 17060bc212c7..90cc7a72ef45 100644
  
  misspell:
         @echo "🐳 $@"
--- 
-2.4.0.53.g8440f74
-
diff --git a/recipes-containers/docker/files/hi.Dockerfile b/recipes-containers/docker/files/hi.Dockerfile
deleted file mode 100644
index 9af68058..00000000
--- a/recipes-containers/docker/files/hi.Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM debian
-
-MAINTAINER amy.fong@windriver.com
-
-RUN apt-get update && apt-get install figlet
-
-ENTRYPOINT [ "/usr/bin/figlet", "hi" ]