github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 04:03:11 +00:00
Code Issues Projects Releases Wiki Activity

Move containerd init file from init package to containerd package

Browse Source 
Otherwise it gets out of sync, and it makes little sense it being in
`init` now anyway.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-07-03 13:42:00 +01:00
parent 1f9fa36869
commit f43e1cbf27
3 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/containerd/Dockerfile
View File

@ -33,3 +33,4 @@ WORKDIR /
COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/ COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/
COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/
COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime
COPY etc etc/

1
pkg/containerd/Makefile
View File

@ -1,4 +1,5 @@
IMAGE=containerd IMAGE=containerd
NETWORK=1 NETWORK=1
DEPS=$(wildcard etc/init.d/*)
include ../package.mk include ../package.mk

0
pkg/init/etc/init.d/010-containerd → pkg/containerd/etc/init.d/010-containerd
View File