Merge pull request #3439 from twz123/bump-alpine-3.18.3

Bump Alpine to v3.18.3

embedded-bins/Makefile.variables

@@ -1,5 +1,5 @@
 alpine_version = 3.18
-alpine_patch_version = $(alpine_version).2
+alpine_patch_version = $(alpine_version).3
 golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version)
 go_version = 1.20.7
 

inttest/footloose-alpine/Dockerfile

@@ -13,9 +13,16 @@ ARG HELM_VERSION
 # Apply our changes to the image
 COPY root/ /
 
-RUN apk add openrc openssh-server bash busybox-openrc coreutils curl haproxy nginx inotify-tools
+RUN apk add --no-cache \
+  alpine-base \
+  openssh-server \
+  bash \
+  coreutils \
+  curl \
+  haproxy \
+  nginx \
+  inotify-tools
 # enable syslog and sshd
-RUN rc-update add cgroups boot
 RUN rc-update add syslog boot
 RUN rc-update add machine-id boot
 RUN rc-update add sshd default
@@ -25,8 +32,6 @@ RUN rc-update add nginx default
 RUN rc-update add k0s-seed default
 # Prevent start-stop-daemon from hanging when max_fds is huge
 RUN sed -Ei -e 's/^[# ](rc_ulimit)=.*/\1="-n 1048576"/' /etc/rc.conf
-# remove -docker keyword so we actually mount cgroups in container
-RUN sed -i -e '/keyword/s/-docker//' /etc/init.d/cgroups
 # disable ttys
 RUN sed -i -e 's/^\(tty[0-9]\)/# \1/' /etc/inittab
 # enable root logins