github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 04:58:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #425 from justincormack/sharedrun

Browse Source 
Fix shared mount of /run
This commit is contained in:
Justin Cormack 2016-08-22 23:06:07 +01:00 committed by GitHub
commit 21434cfa55
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM justincormack/moby-alpine-base:c31ad889c44f78974e8e04a5d489be3a07e77536 FROM justincormack/moby-alpine-base:ac8b97858e93f51dff9a2a2229be551638aff1b2
ENV ARCH=x86_64 ENV ARCH=x86_64

1
alpine/base/Dockerfile
View File

@ -22,4 +22,5 @@ RUN \
e2fsprogs-extra \ e2fsprogs-extra \
openssl \ openssl \
jq \ jq \
util-linux \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*

1
alpine/etc/fstab
View File

@ -1,2 +1 @@
tmpfs /run tmpfs defaults,nodev,relatime,size=10%,mode=755 0 0 tmpfs /run tmpfs defaults,nodev,relatime,size=10%,mode=755 0 0
tmpfs /run tmpfs remount,bind,shared 0 0

3
alpine/packages/docker/etc/init.d/docker
View File

@ -13,6 +13,9 @@ start()
pidfile="/run/docker.pid" pidfile="/run/docker.pid"
# mount /run shared eg for volume drivers
mount -o remount,bind,shared /run
# create cgroups mount for systemd containers # create cgroups mount for systemd containers
if [ ! -d /sys/fs/cgroup/systemd ] if [ ! -d /sys/fs/cgroup/systemd ]
then then