From 5acf36affa6136b0d97ca9c87b81caccad4ee5cf Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 18 Jan 2016 17:09:23 +0000 Subject: [PATCH] set hostname from database if available Signed-off-by: Justin Cormack --- alpine/Dockerfile | 3 ++- alpine/Makefile | 2 +- alpine/etc/hostname- | 1 - alpine/mkinitrd.sh | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 alpine/etc/hostname- diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ea89b807a..8f7a497b8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -37,6 +37,7 @@ COPY packages/9pinit/etc /etc/ COPY packages/ntp15m/etc /etc/ COPY packages/binfmt_misc/etc /etc/ COPY packages/dnsfix/etc /etc/ +COPY packages/hostname/etc /etc/ RUN \ rc-update add swap boot && \ @@ -62,7 +63,7 @@ RUN \ rc-update add localmount && \ rc-update add klogd && \ rc-update add docker default && \ - rc-update add 9pinit default && \ + rc-update add 9pinit boot && \ rc-update add 9pudc default && \ rc-update add 9pudfuse default && \ rc-update add mdnstool default && \ diff --git a/alpine/Makefile b/alpine/Makefile index d8298f1be..ee6dba147 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -1,7 +1,7 @@ all: initrd.img ETCFILES=etc/issue etc/motd etc/network/interfaces -ETCFILES+=etc/hostname- etc/resolv.conf- etc/hosts- +ETCFILES+=etc/resolv.conf- etc/hosts- ETCFILES+=etc/securetty initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) diff --git a/alpine/etc/hostname- b/alpine/etc/hostname- deleted file mode 100644 index 6d0eac4b3..000000000 --- a/alpine/etc/hostname- +++ /dev/null @@ -1 +0,0 @@ -docker \ No newline at end of file diff --git a/alpine/mkinitrd.sh b/alpine/mkinitrd.sh index bd3324b99..5c73a778d 100755 --- a/alpine/mkinitrd.sh +++ b/alpine/mkinitrd.sh @@ -46,7 +46,6 @@ mkdir pty cd /tmp/etc mv hosts- hosts mv resolv.conf- resolv.conf -mv hostname- hostname rm /tmp/bin/mkinitrd.sh