From 5c501c8ec8812fbf8027bc9f46ed635ff15d96e6 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 11 Mar 2017 23:37:36 -0500 Subject: docker-registry: provide via docker-distribution Follow the bouncing docker-registry package. Rather than use the docker hub registry container, we can have finer grained control if we clone and build the docker-distribution repository directly. Since this is distinct from the main docker package/codebase, we break the registry back out into its own package. We also create a baseline configuration and .service file that can be the basis for more complex implementations. Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker_git.bb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'recipes-containers/docker/docker_git.bb') diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index bad3d866..246fbfeb 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb @@ -24,7 +24,6 @@ SRC_URI = "\ git://github.com/docker/docker.git;nobranch=1;name=docker \ git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork \ file://docker.init \ - file://docker-registry.service \ file://hi.Dockerfile \ file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \ " @@ -60,7 +59,7 @@ DEPENDS = " \ grpc-go \ " -PACKAGES =+ "${PN}-contrib ${PN}-registry" +PACKAGES =+ "${PN}-contrib" DEPENDS_append_class-target = "lvm2" RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ @@ -69,7 +68,7 @@ RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ RDEPENDS_${PN} += "virtual/containerd virtual/runc" RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" -RSUGGESTS_${PN} = "lxc docker-registry rt-tests" +RSUGGESTS_${PN} = "lxc rt-tests" DOCKER_PKG="github.com/docker/docker" do_configure[noexec] = "1" @@ -136,9 +135,7 @@ inherit systemd update-rc.d SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker.service','',d)}" -SYSTEMD_SERVICE_${PN}-registry = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docker-registry.service','',d)}" -SYSTEMD_AUTO_ENABLE_${PN}-registry = "enable" SYSTEMD_AUTO_ENABLE_${PN} = "enable" INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" @@ -156,8 +153,6 @@ do_install() { install -m 644 ${S}/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 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system else install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init @@ -172,9 +167,6 @@ inherit useradd USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r docker" -FILES_${PN}-registry += "${systemd_unitdir}/system/docker-registry.service" -RDEPENDS_${PN}-registry += "docker" - FILES_${PN} += "${systemd_unitdir}/system/*" FILES_${PN}-contrib += "${datadir}/docker/check-config.sh" -- cgit v1.2.3-54-g00ecf