diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb index 74170cbfaf..4ba5e817bf 100644 --- a/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb +++ b/import-layers/meta-virtualization/recipes-containers/docker/docker_git.bb @@ -18,11 +18,13 @@ DESCRIPTION = "Linux container runtime \ subtle and/or glaring issues. \ " -SRCREV_docker = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178" -SRCREV_libnetwork="0f534354b813003a754606689722fe253101bc4e" +SRCREV_docker = "e639a70fbe999d96354a5bcf560231b7b8aa935c" +SRCREV_libnetwork = "26addf43a5d925ff79d262dbbdb5344bc2b6e198" +SRCREV_cli = "a765218f1988e85b68aa3977f34893ec7b059a60" SRC_URI = "\ - git://github.com/docker/docker.git;nobranch=1;name=docker \ + git://github.com/moby/moby.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 \ file://docker.init \ file://hi.Dockerfile \ file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \ @@ -30,11 +32,13 @@ SRC_URI = "\ # Apache-2.0 for docker LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aadc30f9c14d876ded7bedc0afd2d3d7" +LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=9740d093a080530b5c5c6573df9af45a" + +GO_IMPORT = "import" S = "${WORKDIR}/git" -DOCKER_VERSION = "1.13.0" +DOCKER_VERSION = "17.06.0" PV = "${DOCKER_VERSION}+git${SRCREV_docker}" DEPENDS = " \ @@ -43,7 +47,6 @@ DEPENDS = " \ go-context \ go-mux \ go-patricia \ - go-libtrust \ go-logrus \ go-fsnotify \ go-dbus \ @@ -80,20 +83,21 @@ do_compile() { # Set GOPATH. See 'PACKAGERS.md'. Don't rely on # docker to download its dependencies but rather # use dependencies packaged independently. - cd ${S} + cd ${S}/src/import rm -rf .gopath mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")" ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}" mkdir -p .gopath/src/github.com/docker - ln -sf ../../../../../libnetwork .gopath/src/github.com/docker/libnetwork + ln -sf ${WORKDIR}/libnetwork .gopath/src/github.com/docker/libnetwork + ln -sf ${WORKDIR}/cli .gopath/src/github.com/docker/cli - export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" + 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" - cd - # Pass the needed cflags/ldflags so that cgo # can find the needed headers files and libraries + export GOARCH=${TARGET_GOARCH} export CGO_ENABLED="1" export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" @@ -107,7 +111,10 @@ do_compile() { ./hack/make.sh dynbinary # build the proxy - go build -o ${S}/docker-proxy github.com/docker/libnetwork/cmd/proxy + go build -o ${S}/src/import/docker-proxy github.com/docker/libnetwork/cmd/proxy + + # build the cli + go build -o ${S}/src/import/bundles/latest/dynbinary-client/docker github.com/docker/cli/cmd/docker } SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" @@ -117,19 +124,19 @@ SYSTEMD_AUTO_ENABLE_${PN} = "enable" INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" -INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" +INITSCRIPT_PARAMS_${PN} = "defaults" do_install() { mkdir -p ${D}/${bindir} - cp ${S}/bundles/latest/dynbinary-client/docker ${D}/${bindir}/docker - cp ${S}/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd - cp ${S}/docker-proxy ${D}/${bindir}/docker-proxy + cp ${S}/src/import/bundles/latest/dynbinary-client/docker ${D}/${bindir}/docker + cp ${S}/src/import/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd + cp ${S}/src/import/docker-proxy ${D}/${bindir}/docker-proxy if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system + install -m 644 ${S}/src/import/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system # replaces one copied from above with one that uses the local registry for a mirror - install -m 644 ${S}/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system + install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system else install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init @@ -137,7 +144,7 @@ do_install() { mkdir -p ${D}${datadir}/docker/ cp ${WORKDIR}/hi.Dockerfile ${D}${datadir}/docker/ - install -m 0755 ${S}/contrib/check-config.sh ${D}${datadir}/docker/ + install -m 0755 ${S}/src/import/contrib/check-config.sh ${D}${datadir}/docker/ } inherit useradd |