From 6670833de8b22bcccb817b6f69d013f22aef3b87 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 18 Dec 2015 16:41:29 +0000 Subject: [PATCH] move config files under packages Signed-off-by: Justin Cormack --- alpine/Dockerfile | 7 ++++++- alpine/Makefile | 3 +-- alpine/{ => packages/9pudc}/etc/init.d/9pudc | 0 alpine/{ => packages/docker}/etc/conf.d/docker | 0 alpine/{ => packages/docker}/etc/init.d/docker | 0 alpine/{ => packages/mdnstool}/etc/init.d/mdnstool | 0 6 files changed, 7 insertions(+), 3 deletions(-) rename alpine/{ => packages/9pudc}/etc/init.d/9pudc (100%) rename alpine/{ => packages/docker}/etc/conf.d/docker (100%) rename alpine/{ => packages/docker}/etc/init.d/docker (100%) rename alpine/{ => packages/mdnstool}/etc/init.d/mdnstool (100%) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 86ca7a787..62fbec82f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -17,8 +17,13 @@ COPY etc /etc/ ADD kernel/aufs-utils.tar / COPY mkinitrd.sh /bin/ -COPY packages/9pudc/9pudc packages/mdnstool/mdnstool /sbin/ + +COPY packages/9pudc/9pudc /sbin/ +COPY packages/9pudc/etc /etc/ +COPY packages/mdnstool/mdnstool /sbin/ +COPY packages/mdnstool/etc /etc/ COPY packages/docker/docker /usr/bin/ +COPY packages/docker/etc /etc/ RUN \ setup-timezone -z UTC && \ diff --git a/alpine/Makefile b/alpine/Makefile index ff25a99ce..b18e6eac1 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -3,9 +3,8 @@ all: initrd.img ETCFILES=etc/issue etc/motd etc/inittab etc/network/interfaces ETCFILES+=etc/hostname- etc/resolv.conf- etc/hosts- ETCFILES+=etc/init.d/chronyd -ETCFILES+=etc/init.d/9pinit etc/init.d/9pudc etc/init.d/mdnstool +ETCFILES+=etc/init.d/9pinit ETCFILES+=etc/init.d/automount -ETCFILES+=etc/conf.d/docker ETCFILES+=etc/securetty kernel/aufs-utils.tar: diff --git a/alpine/etc/init.d/9pudc b/alpine/packages/9pudc/etc/init.d/9pudc similarity index 100% rename from alpine/etc/init.d/9pudc rename to alpine/packages/9pudc/etc/init.d/9pudc diff --git a/alpine/etc/conf.d/docker b/alpine/packages/docker/etc/conf.d/docker similarity index 100% rename from alpine/etc/conf.d/docker rename to alpine/packages/docker/etc/conf.d/docker diff --git a/alpine/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker similarity index 100% rename from alpine/etc/init.d/docker rename to alpine/packages/docker/etc/init.d/docker diff --git a/alpine/etc/init.d/mdnstool b/alpine/packages/mdnstool/etc/init.d/mdnstool similarity index 100% rename from alpine/etc/init.d/mdnstool rename to alpine/packages/mdnstool/etc/init.d/mdnstool