github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Update build labels for new resolv.conf bind mount

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-07-25 15:25:55 +01:00
parent a81d2deb61
commit 1e236e9f0c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/dhcpcd/Dockerfile
View File

@ -16,4 +16,4 @@ WORKDIR /
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY /dhcpcd.conf /usr/ / COPY /dhcpcd.conf /usr/ /
CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"]
LABEL org.mobyproject.config='{"binds": ["/var:/var", "/tmp/etc:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' LABEL org.mobyproject.config='{"binds": ["/run/resolvconf:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}'

2
pkg/getty/Dockerfile
View File

@ -32,4 +32,4 @@ COPY --from=mirror /out/ /
COPY usr/ /usr/ COPY usr/ /usr/
COPY etc/ /etc/ COPY etc/ /etc/
CMD ["/usr/bin/rungetty.sh"] CMD ["/usr/bin/rungetty.sh"]
LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/etc/resolv.conf:/etc/resolv.conf", "/run:/run", "/tmp:/tmp", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/containers:/containers","/var/log:/var/log","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}'

2
pkg/metadata/Dockerfile
View File

@ -12,4 +12,4 @@ CMD []
WORKDIR / WORKDIR /
COPY --from=mirror /go/bin/metadata /usr/bin/metadata COPY --from=mirror /go/bin/metadata /usr/bin/metadata
CMD ["/usr/bin/metadata"] CMD ["/usr/bin/metadata"]
LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/tmp/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}' LABEL org.mobyproject.config='{"binds": ["/dev:/dev", "/var:/var", "/etc/resolv.conf:/etc/resolv.conf"], "capabilities": ["CAP_SYS_ADMIN"]}'

2
pkg/openntpd/Dockerfile
View File

@ -16,4 +16,4 @@ WORKDIR /
COPY --from=mirror /out/ / COPY --from=mirror /out/ /
COPY etc/ /etc/ COPY etc/ /etc/
CMD ["/usr/sbin/ntpd", "-d", "-s"] CMD ["/usr/sbin/ntpd", "-d", "-s"]
LABEL org.mobyproject.config='{"capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}' LABEL org.mobyproject.config='{"binds": "/etc/resolv.conf:/etc/resolv.conf", "capabilities": ["CAP_SYS_TIME", "CAP_SYS_NICE", "CAP_SYS_CHROOT", "CAP_SETUID", "CAP_SETGID"]}'