From f43e1cbf273c8c795c35040e79e167a7decd9c9e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 3 Jul 2017 13:42:00 +0100 Subject: [PATCH] Move containerd init file from init package to containerd package Otherwise it gets out of sync, and it makes little sense it being in `init` now anyway. Signed-off-by: Justin Cormack --- pkg/containerd/Dockerfile | 1 + pkg/containerd/Makefile | 1 + pkg/{init => containerd}/etc/init.d/010-containerd | 0 3 files changed, 2 insertions(+) rename pkg/{init => containerd}/etc/init.d/010-containerd (100%) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index f8d2f8d89..028ab62f5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -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 /etc/containerd/config.toml /etc/containerd/ COPY --from=alpine /usr/share/zoneinfo/UTC /etc/localtime +COPY etc etc/ diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile index 03b5ef9f0..31828317c 100644 --- a/pkg/containerd/Makefile +++ b/pkg/containerd/Makefile @@ -1,4 +1,5 @@ IMAGE=containerd NETWORK=1 +DEPS=$(wildcard etc/init.d/*) include ../package.mk diff --git a/pkg/init/etc/init.d/010-containerd b/pkg/containerd/etc/init.d/010-containerd similarity index 100% rename from pkg/init/etc/init.d/010-containerd rename to pkg/containerd/etc/init.d/010-containerd