MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: use .service file from contrib

Browse Source 
Oru existing docker.service file is using an out of date command. We
can use the contrib .service file instead .. and hopefully it will
stay up to date.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2017-02-17 13:26:04 -05:00
parent 9f8e6b8550
commit 6d05401c38
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
recipes-containers/docker/docker_git.bb
View File

@ -21,7 +21,6 @@ DESCRIPTION = "Linux container runtime \
SRCREV = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178" SRCREV = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178"
SRC_URI = "\ SRC_URI = "\
git://github.com/docker/docker.git;nobranch=1 \ git://github.com/docker/docker.git;nobranch=1 \
file://docker.service \
file://docker.init \ file://docker.init \
file://hi.Dockerfile \ file://hi.Dockerfile \
file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \ file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \
@ -140,7 +139,7 @@ do_install() {
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system
install -m 644 ${S}/contrib/init/systemd/docker.* ${D}/${systemd_unitdir}/system 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 # replaces one copied from above with one that uses the local registry for a mirror
install -m 644 ${WORKDIR}/docker.service ${D}/${systemd_unitdir}/system install -m 644 ${S}/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
else else
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init