summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2015-07-22 10:43:14 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-07-22 16:12:59 -0400
commitacb711dfa93a916805c286fafa8c304394fc05cc (patch)
tree88673a76fd7fe95447432e21c6935a4c10a00ef8
parentfb380fd60f31edf9786e1ad82c1e76eefad82697 (diff)
downloadmeta-virtualization-acb711dfa93a916805c286fafa8c304394fc05cc.tar.gz
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> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/docker-registry/docker-registry_git.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-containers/docker-registry/docker-registry_git.bb b/recipes-containers/docker-registry/docker-registry_git.bb
index 338cb690..fe766d24 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() {
83 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 83 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
84 install -d ${D}${systemd_unitdir}/system 84 install -d ${D}${systemd_unitdir}/system
85 install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system 85 install -m 644 ${WORKDIR}/docker-registry.service ${D}/${systemd_unitdir}/system
86 sed -i "s|#WORKDIR#|${PYTHON_SITEPACKAGES_DIR}/docker_registry|" ${D}/${systemd_unitdir}/system/docker-registry.service
86 fi 87 fi
87 # based on config_mirror.yml - uses /var/docker-registry instead of /tmp for files 88 # based on config_mirror.yml - uses /var/docker-registry instead of /tmp for files
88 install ${WORKDIR}/config.yml ${D}/etc/docker-registry.yml 89 install ${WORKDIR}/config.yml ${D}/etc/docker-registry.yml