diff --git a/image/build-image.sh b/image/build-image.sh index 4663fb8..1504d7d 100755 --- a/image/build-image.sh +++ b/image/build-image.sh @@ -31,7 +31,7 @@ alpine-make-vm-image \ --fs-skel-dir "$OVERLAY_DIR" \ --fs-skel-chown root:root \ --script-chroot \ - --packages "git curl docker cronie dhclient" \ + --packages "git curl docker cronie dhcpcd" \ "$IMAGE_FILE" \ "$CONFIGURE_SH" | tee $TMP diff --git a/image/configure.sh b/image/configure.sh index 44a5305..38b4dc5 100755 --- a/image/configure.sh +++ b/image/configure.sh @@ -33,6 +33,10 @@ rc-update add acpid default rc-update add docker default rc-update add cronie default +step 'Adjust syslog' +sed -i 's/^SYSLOGD_OPTS="\(.*\)"/SYSLOGD_OPTS="\1 -K"/' /etc/conf.d/syslog +grep "SYSLOGD_OPTS" /etc/conf.d/syslog + step 'Clean up APK cache and documents' rm -rf /var/cache/apk/* || true diff --git a/image/overlay/etc/dhcp/dhclient.conf b/image/overlay/etc/dhcp/dhclient.conf deleted file mode 100644 index d30dfb4..0000000 --- a/image/overlay/etc/dhcp/dhclient.conf +++ /dev/null @@ -1,3 +0,0 @@ -interface "eth0" { - supersede routers GATEWAY_ADDRESS; -} \ No newline at end of file diff --git a/image/overlay/etc/network/interfaces b/image/overlay/etc/network/interfaces index de21e34..c4da640 100644 --- a/image/overlay/etc/network/interfaces +++ b/image/overlay/etc/network/interfaces @@ -3,5 +3,8 @@ iface lo inet loopback auto eth0 iface eth0 inet manual - post-up dhclient -v eth0 - pre-down dhclient -x eth0 \ No newline at end of file + pre-up ip link set dev eth0 up + up dhcpcd --nobackground --static routers=GATEWAY_ADDRESS eth0 + + down dhcpcd --release eth0 + post-down ip link set dev eth0 down diff --git a/test.sh b/test.sh index c0721e5..9c3d8bd 100755 --- a/test.sh +++ b/test.sh @@ -8,5 +8,5 @@ set -euo pipefail --cmdline "modules=ext4 root=/dev/vda rootfstype=ext4 rw console=hvc0" \ --cpus boot=${CPU_COUNT:-4} \ --memory size=${MEMORY:-4G},shared=on \ - --net "tap=,mac=,ip=,mask=" + --net "tap=,ip=,mac=,mask=" $@ diff --git a/vm.Dockerfile b/vm.Dockerfile index 1bb2504..f0cc570 100644 --- a/vm.Dockerfile +++ b/vm.Dockerfile @@ -18,7 +18,7 @@ RUN apk update && apk add alpine-make-vm-image COPY ./image /kitchen RUN sed -i "s#_REPO_#$CLOUD_CONFIG_REPO#g" /kitchen/overlay/daemon/update-keys.sh && \ sed -i "s#_REVISION_#$CLOUD_CONFIG_REVISION#g" /kitchen/overlay/daemon/update-keys.sh && \ - sed -i "s#GATEWAY_ADDRESS#$CLOUD_GATEWAY_ADDRESS#g" /kitchen/overlay/etc/dhcp/dhclient.conf + sed -i "s#GATEWAY_ADDRESS#$CLOUD_GATEWAY_ADDRESS#g" /kitchen/overlay/etc/network/interfaces COPY --from=bubble-builder /build/daemon /bin/bubble COPY --from=bubble-builder /build/auth_server /bin/auth-server RUN --security=insecure \