[PATCH] docker-registry invalid path on startup

[PATCH] docker-registry invalid path on startup

[Amy Fong]

From 383cba6388cf7a1a221a0b03b78d017b0f0fe299 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Wed, 22 Jul 2015 10:43:14 -0400
Subject: [PATCH] docker-registry invalid path on startup

Systemd throws the following warning at boot:
systemd[1]: [/lib/systemd/system/docker-registry.service:10]
	Not an absolute path, ignoring: #WORKDIR#

Fix WORKDIR in docker-registry's systemd from #WORKDIR# to
${PYTHON_SITEPACKAGES_DIR}/docker_registry

Signed-off-by: Amy Fong <amy.fong@windriver.com>
---
 recipes-containers/docker-registry/docker-registry_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-containers/docker-registry/docker-registry_git.bb b/recipes-containers/docker-registry/docker-registry_git.bb
index 338cb69..fe766d2 100644
--- a/recipes-containers/docker-registry/docker-registry_git.bb
+++ b/recipes-containers/docker-registry/docker-registry_git.bb
@@ -83,6 +83,7 @@ do_install_append() {
 	if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
 		install -d ${D}${systemd_unitdir}/system
 		install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system
+		sed -i "s|#WORKDIR#|${PYTHON_SITEPACKAGES_DIR}/docker_registry|" ${D}/${systemd_unitdir}/system/docker-registry.service
 	fi
 	# based on config_mirror.yml - uses /var/docker-registry instead of /tmp for files
 	install ${WORKDIR}/config.yml ${D}/etc/docker-registry.yml
-- 
2.1.4

Re: [PATCH] docker-registry invalid path on startup

[Bruce Ashfield]

merged.

Bruce

On Wed, Jul 22, 2015 at 12:12 PM, Amy Fong <amy.fong@windriver.com> wrote:
> From 383cba6388cf7a1a221a0b03b78d017b0f0fe299 Mon Sep 17 00:00:00 2001
> From: Amy Fong <amy.fong@windriver.com>
> Date: Wed, 22 Jul 2015 10:43:14 -0400
> Subject: [PATCH] docker-registry invalid path on startup
>
> Systemd throws the following warning at boot:
> systemd[1]: [/lib/systemd/system/docker-registry.service:10]
>         Not an absolute path, ignoring: #WORKDIR#
>
> Fix WORKDIR in docker-registry's systemd from #WORKDIR# to
> ${PYTHON_SITEPACKAGES_DIR}/docker_registry
>
> Signed-off-by: Amy Fong <amy.fong@windriver.com>
> ---
>  recipes-containers/docker-registry/docker-registry_git.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/recipes-containers/docker-registry/docker-registry_git.bb b/recipes-containers/docker-registry/docker-registry_git.bb
> index 338cb69..fe766d2 100644
> --- a/recipes-containers/docker-registry/docker-registry_git.bb
> +++ b/recipes-containers/docker-registry/docker-registry_git.bb
> @@ -83,6 +83,7 @@ do_install_append() {
>         if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
>                 install -d ${D}${systemd_unitdir}/system
>                 install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system
> +               sed -i "s|#WORKDIR#|${PYTHON_SITEPACKAGES_DIR}/docker_registry|" ${D}/${systemd_unitdir}/system/docker-registry.service
>         fi
>         # based on config_mirror.yml - uses /var/docker-registry instead of /tmp for files
>         install ${WORKDIR}/config.yml ${D}/etc/docker-registry.yml
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"