diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9835cf046..1bd036c4c 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -72,7 +72,6 @@ COPY packages/oom/etc /etc/ COPY packages/9pmount-vsock/9pmount-vsock /sbin/ COPY packages/test/etc /etc/ COPY packages/test/mobytest /usr/bin/ -COPY packages/sysctl/etc /etc/ COPY packages/iptables/iptables /usr/local/sbin/ COPY packages/containerd/etc /etc/ COPY packages/aws/etc /etc/ @@ -97,6 +96,7 @@ RUN \ rc-update add devfs sysinit && \ rc-update add hwdrivers sysinit && \ rc-update add sysfs && \ + rc-update add sysfsconf && \ rc-update add fsck && \ rc-update add root && \ rc-update add localmount && \ diff --git a/alpine/packages/sysctl/etc/sysctl.d/01-moby.conf b/alpine/etc/sysctl.d/01-moby.conf similarity index 100% rename from alpine/packages/sysctl/etc/sysctl.d/01-moby.conf rename to alpine/etc/sysctl.d/01-moby.conf diff --git a/alpine/etc/sysfs.d/01-moby.conf b/alpine/etc/sysfs.d/01-moby.conf new file mode 100644 index 000000000..92aeded2b --- /dev/null +++ b/alpine/etc/sysfs.d/01-moby.conf @@ -0,0 +1,2 @@ +kernel/mm/transparent_hugepage/enabled = madvise +kernel/mm/transparent_hugepage/defrag = madvise diff --git a/alpine/packages/hostsettings/etc/init.d/hostsettings b/alpine/packages/hostsettings/etc/init.d/hostsettings index e6bd6d6dc..b589df877 100755 --- a/alpine/packages/hostsettings/etc/init.d/hostsettings +++ b/alpine/packages/hostsettings/etc/init.d/hostsettings @@ -10,7 +10,7 @@ start() { ebegin "Configuring host settings from database" 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 etc/hosts && mobyconfig get etc/hosts >> /etc/hosts