docker: remove obsolete docker-registry recipe

The docker v1 registry has long been depreciated and moved into the
docker distribution library.

The registry is run via the docker CLI and not through a standalone
server.

This change removes the old registry and adds a .service file + package
for docker registry in the main docker recipe. Anyone that wants to
run a local registry can install the docker-registry package and the
service will start.

Note: No full config.yml file is provided, since the default are sane.
If tweaks are required, we can use ENV vars or consider adding a
config overlay.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 30 insertions, 1 deletions

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index da1aef6a..bad3d866 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -24,6 +24,7 @@ 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 \
         "
@@ -59,7 +60,7 @@ DEPENDS = " \
     grpc-go \
     "
 
-PACKAGES =+ "${PN}-contrib"
+PACKAGES =+ "${PN}-contrib ${PN}-registry"
 
 DEPENDS_append_class-target = "lvm2"
 RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \
@@ -135,6 +136,10 @@ 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)}"
 INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
@@ -151,6 +156,8 @@ 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
@@ -165,6 +172,9 @@ 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"
diff --git a/recipes-containers/docker/files/docker-registry.service b/recipes-containers/docker/files/docker-registry.service
new file mode 100644
index 00000000..7b4bc468
--- /dev/null
+++ b/recipes-containers/docker/files/docker-registry.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=docker private registry service
+After=docker.service
+
+[Service]
+ExecStartPre=-/usr/bin/docker kill registry
+ExecStartPre=-/usr/bin/docker rm registry
+ExecStart=/usr/bin/docker run --name registry -v /mirror/registry:/tmp/ -p 5000:5000 \
+                          -e "STANDALONE=true" \
+                          -e "MIRROR_SOURCE=https://registry-1.docker.io" \
+                          -e "MIRROR_SOURCE_INDEX=https://index.docker.io" \
+                          -e "SETTINGS_FLAVOR=local" \
+                          registry
+ExecStop=-/usr/bin/docker stop registry
+Restart=always
+RestartSec=10s
+
+[Install]
+WantedBy=multi-user.target