mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Update remaining uses of alpine:3.7 to alpine:3.8
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
This commit is contained in:
parent
63ae346152
commit
8301540809
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.7 AS extract
|
FROM alpine:3.8 AS extract
|
||||||
|
|
||||||
ARG DEB_URLS
|
ARG DEB_URLS
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.7 AS extract
|
FROM alpine:3.8 AS extract
|
||||||
|
|
||||||
ARG RPM_URLS
|
ARG RPM_URLS
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ onboot:
|
|||||||
command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"]
|
command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"]
|
||||||
# mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
|
# mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
|
||||||
- name: mount-vpnkit
|
- name: mount-vpnkit
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/:/host_var:rbind,rshared
|
- /var/:/host_var:rbind,rshared
|
||||||
capabilities:
|
capabilities:
|
||||||
@ -39,7 +39,7 @@ onboot:
|
|||||||
command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"]
|
command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"]
|
||||||
# move logs to the mounted disk (this is a temporary fix until we can limit the log sizes)
|
# move logs to the mounted disk (this is a temporary fix until we can limit the log sizes)
|
||||||
- name: move-logs
|
- name: move-logs
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var:/host_var
|
- /var:/host_var
|
||||||
command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"]
|
command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"]
|
||||||
|
@ -10,7 +10,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
|
image: linuxkit/dhcpcd:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: mount-vpnkit
|
- name: mount-vpnkit
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/:/host_var:rbind,rshared
|
- /var/:/host_var:rbind,rshared
|
||||||
capabilities:
|
capabilities:
|
||||||
|
@ -17,7 +17,7 @@ COPY ./src/* ./
|
|||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
FROM alpine:3.7
|
FROM alpine:3.8
|
||||||
COPY --from=build /kmod/hello_world.ko /
|
COPY --from=build /kmod/hello_world.ko /
|
||||||
COPY check.sh /check.sh
|
COPY check.sh /check.sh
|
||||||
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
||||||
|
@ -17,7 +17,7 @@ COPY ./src/* ./
|
|||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
FROM alpine:3.7
|
FROM alpine:3.8
|
||||||
COPY --from=build /kmod/hello_world.ko /
|
COPY --from=build /kmod/hello_world.ko /
|
||||||
COPY check.sh /check.sh
|
COPY check.sh /check.sh
|
||||||
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
||||||
|
@ -17,7 +17,7 @@ COPY ./src/* ./
|
|||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
FROM alpine:3.7
|
FROM alpine:3.8
|
||||||
COPY --from=build /kmod/hello_world.ko /
|
COPY --from=build /kmod/hello_world.ko /
|
||||||
COPY check.sh /check.sh
|
COPY check.sh /check.sh
|
||||||
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
||||||
|
@ -17,7 +17,7 @@ COPY ./src/* ./
|
|||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
FROM alpine:3.7
|
FROM alpine:3.8
|
||||||
COPY --from=build /kmod/hello_world.ko /
|
COPY --from=build /kmod/hello_world.ko /
|
||||||
COPY check.sh /check.sh
|
COPY check.sh /check.sh
|
||||||
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
ENTRYPOINT ["/bin/sh", "/check.sh"]
|
||||||
|
@ -6,7 +6,7 @@ init:
|
|||||||
- linuxkit/runc:01b4f0706d999f9065ef44492689e43d0bcd83c5
|
- linuxkit/runc:01b4f0706d999f9065ef44492689e43d0bcd83c5
|
||||||
onboot:
|
onboot:
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
readonly: true
|
readonly: true
|
||||||
binds:
|
binds:
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -8,7 +8,7 @@ onboot:
|
|||||||
- name: binfmt
|
- name: binfmt
|
||||||
image: linuxkit/binfmt:b0d833f5ecd26d6cb991622b1234afd9a0f6ee31
|
image: linuxkit/binfmt:b0d833f5ecd26d6cb991622b1234afd9a0f6ee31
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||||
@ -23,4 +23,4 @@ trust:
|
|||||||
org:
|
org:
|
||||||
- linuxkit
|
- linuxkit
|
||||||
image:
|
image:
|
||||||
- alpine:3.7
|
- alpine:3.8
|
||||||
|
@ -7,7 +7,7 @@ init:
|
|||||||
- linuxkit/ca-certificates:ce2692e89d2be341b0d3caa0b0aa01b37d5d0694
|
- linuxkit/ca-certificates:ce2692e89d2be341b0d3caa0b0aa01b37d5d0694
|
||||||
onboot:
|
onboot:
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
- /etc:/host-etc
|
- /etc:/host-etc
|
||||||
@ -22,4 +22,4 @@ trust:
|
|||||||
org:
|
org:
|
||||||
- linuxkit
|
- linuxkit
|
||||||
image:
|
image:
|
||||||
- alpine:3.7
|
- alpine:3.8
|
||||||
|
@ -9,7 +9,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
|
image: linuxkit/dhcpcd:0aa201ad1a4c134f0ed6ab2cec23602d5ee73d7f
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
net: host
|
net: host
|
||||||
binds:
|
binds:
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
@ -24,4 +24,4 @@ trust:
|
|||||||
org:
|
org:
|
||||||
- linuxkit
|
- linuxkit
|
||||||
image:
|
image:
|
||||||
- alpine:3.7
|
- alpine:3.8
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
command: ["touch", "/var/lib/docker/bar"]
|
command: ["touch", "/var/lib/docker/bar"]
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -15,7 +15,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
command: ["touch", "/var/lib/docker/bar"]
|
command: ["touch", "/var/lib/docker/bar"]
|
||||||
|
@ -15,7 +15,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
command: ["touch", "/var/lib/docker/bar"]
|
command: ["touch", "/var/lib/docker/bar"]
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -15,7 +15,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -12,7 +12,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
|
@ -18,7 +18,7 @@ onboot:
|
|||||||
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
image: linuxkit/mount:6b25743397b520924de11f96e3eeb613aa04a507
|
||||||
command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
|
command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /var/lib/docker:/var/lib/docker
|
- /var/lib/docker:/var/lib/docker
|
||||||
- /var/foo:/var/foo
|
- /var/foo:/var/foo
|
||||||
|
@ -8,7 +8,7 @@ onboot:
|
|||||||
- name: sysctl
|
- name: sysctl
|
||||||
image: linuxkit/sysctl:6f96e509c7383b31dfdd2c3e9fa01c6ab3e4c586
|
image: linuxkit/sysctl:6f96e509c7383b31dfdd2c3e9fa01c6ab3e4c586
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
ipc: host
|
ipc: host
|
||||||
@ -25,4 +25,4 @@ trust:
|
|||||||
org:
|
org:
|
||||||
- linuxkit
|
- linuxkit
|
||||||
image:
|
image:
|
||||||
- alpine:3.7
|
- alpine:3.8
|
||||||
|
@ -38,7 +38,7 @@ onboot:
|
|||||||
net: /run/netns/wg1
|
net: /run/netns/wg1
|
||||||
onshutdown:
|
onshutdown:
|
||||||
- name: test2
|
- name: test2
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
binds:
|
binds:
|
||||||
- /tmp:/tmp
|
- /tmp:/tmp
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
@ -55,7 +55,7 @@ services:
|
|||||||
- CAP_SETGID
|
- CAP_SETGID
|
||||||
- CAP_DAC_OVERRIDE
|
- CAP_DAC_OVERRIDE
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.7
|
image: alpine:3.8
|
||||||
net: /run/netns/wg1
|
net: /run/netns/wg1
|
||||||
pid: host
|
pid: host
|
||||||
capabilities:
|
capabilities:
|
||||||
|
Loading…
Reference in New Issue
Block a user