Skip to content

Commit

Permalink
Merge pull request #3445 from k0sproject/backport-3438-to-release-1.26
Browse files Browse the repository at this point in the history
[Backport release-1.26] Fix hanging start-stop-daemon in footloose Alpine
  • Loading branch information
ncopa authored Sep 13, 2023
2 parents 1c14619 + 44c701b commit 5cd4a6e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion inttest/footloose-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ RUN rc-update add local default
RUN rc-update add nginx default
# Ensures that /usr/local/bin/k0s is seeded from /dist at startup
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
Expand Down

0 comments on commit 5cd4a6e

Please sign in to comment.