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

Split out Windows network config from hostsettings

Browse Source 
On cloud editions eg AWS settings may come from the network, so
we need to move this to after network setup, while the Windows
network config changes need to happen before, so split the init script.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-11-02 14:49:24 +00:00
parent 5120ea2fb3
commit fed22cee00
3 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
alpine/Dockerfile
View File

@ -45,7 +45,8 @@ RUN \
rc-update add automount boot && \
rc-update add diagnostics default && \
rc-update add binfmt_misc default && \
rc-update add hostsettings boot && \
rc-update add hostsettings default && \
rc-update add windowsnet boot && \
rc-update add hv_kvp_daemon default && \
rc-update add hv_vss_daemon default && \
rc-update add oom default && \

24
alpine/packages/hostsettings/etc/init.d/hostsettings
View File

@ -3,7 +3,9 @@
description="Configuring settings from database."
depend() {
before sysctl net
# AWS gets settings via network
need net
before docker
}
start() {
@ -11,26 +13,12 @@ start() {
mobyconfig exists etc/sysctl.conf && mobyconfig get etc/sysctl.conf > /etc/sysctl.conf
mobyconfig exists etc/sysfs.conf && mobyconfig get etc/sysfs.conf > /etc/sysfs.conf
mobyconfig exists etc/resolv.conf && mobyconfig get etc/resolv.conf > /etc/resolv.conf
mobyconfig exists random-seed && mobyconfig get random-seed > /dev/urandom
mobyconfig exists etc/resolv.conf && mobyconfig get etc/resolv.conf > /etc/resolv.conf
mobyconfig exists etc/hosts && mobyconfig get etc/hosts >> /etc/hosts
if [ "$(mobyplatform)" = "windows" ]; then
# We have two network interfaces. The Hyper-V interface
# comes up as eth0. Rename and configure it.
ip link set eth0 down
ip link set eth0 name hvint0
mobyconfig exists net/config && NETCONFIG=`mobyconfig get net/config`
if [ "${NETCONFIG}" = "static" ]; then
# assume that the other configsDB entries exist
IP=`mobyconfig get net/address`
MASK=`mobyconfig get net/netmask`
ip addr add ${IP}/${MASK} dev hvint0
ip link set hvint0 up
fi
fi
mobyconfig exists etc/ssl/certs/ca-certificates.crt && mobyconfig get etc/ssl/certs/ca-certificates.crt >> /etc/ssl/certs/ca-certificates.crt
eend 0

29
alpine/packages/hostsettings/etc/init.d/windowsnet Executable file
View File

@ -0,0 +1,29 @@
#!/sbin/openrc-run
description="Configuring Windows network settings from database."
depend() {
before sysctl net
}
start() {
[ "$(mobyplatform)" = "windows" ] || exit 0
ebegin "Configuring Windows network settings from database"
# We have two network interfaces. The Hyper-V interface
# comes up as eth0. Rename and configure it.
ip link set eth0 down
ip link set eth0 name hvint0
mobyconfig exists net/config && NETCONFIG=`mobyconfig get net/config`
if [ "${NETCONFIG}" = "static" ]; then
# assume that the other configsDB entries exist
IP=`mobyconfig get net/address`
MASK=`mobyconfig get net/netmask`
ip addr add ${IP}/${MASK} dev hvint0
ip link set hvint0 up
fi
eend 0
}