Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#1554 from prasadkatti/update_link
Browse files Browse the repository at this point in the history
Update link to systemd CONTAINER_INTERFACE reference
  • Loading branch information
k8s-ci-robot authored May 3, 2020
2 parents 89cc045 + 4f2d4c4 commit 471fa83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ RUN echo "Ensuring scripts are executable ..." \
&& sed -i /etc/nsswitch.conf -re 's#^(hosts:\s*).*#\1dns files#'

# tell systemd that it is in docker (it will check for the container env)
# https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
# https://systemd.io/CONTAINER_INTERFACE/
ENV container docker
# systemd exits on SIGRTMIN+3, not SIGTERM (which re-executes it)
# https://bugzilla.redhat.com/show_bug.cgi?id=1201657
Expand Down
2 changes: 1 addition & 1 deletion images/base/files/usr/local/bin/entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fix_mount() {

echo 'INFO: remounting /sys read-only'
# systemd-in-a-container should have read only /sys
# https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
# https://systemd.io/CONTAINER_INTERFACE/
# however, we need other things from `docker run --privileged` ...
# and this flag also happens to make /sys rw, amongst other things
mount -o remount,ro /sys
Expand Down

0 comments on commit 471fa83

Please sign in to comment.