mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-20 09:39:08 +00:00
tests: Switch test to alpine:3.7
Some testis explicitly use alpine:3.6 and alpine:3.5 to run some shell scripts. Switch them to alpine:3.7 like the rest of the packages and tools. Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
parent
b46c983069
commit
8434058dcf
@ -17,7 +17,7 @@ COPY ./src/* ./
|
|||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# Package
|
# Package
|
||||||
FROM alpine:3.5
|
FROM alpine:3.7
|
||||||
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.5
|
FROM alpine:3.7
|
||||||
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.5
|
FROM alpine:3.7
|
||||||
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:abc3f292653e64a2fd488e9675ace19a55ec7023
|
- linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023
|
||||||
onboot:
|
onboot:
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:4b1d7a8dab03c09855fb4b6060a42b2294674b47
|
image: linuxkit/binfmt:4b1d7a8dab03c09855fb4b6060a42b2294674b47
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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.6
|
- alpine:3.7
|
||||||
|
@ -7,7 +7,7 @@ init:
|
|||||||
- linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
|
- linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0
|
||||||
onboot:
|
onboot:
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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.6
|
- alpine:3.7
|
||||||
|
@ -9,7 +9,7 @@ onboot:
|
|||||||
image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9
|
image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9
|
||||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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.6
|
- alpine:3.7
|
||||||
|
@ -11,7 +11,7 @@ onboot:
|
|||||||
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
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.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
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.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
command: ["/usr/bin/mountie", "/var/lib/docker"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:b346ec277b7074e5c9986128a879c10a1d18742b
|
image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b
|
||||||
command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
|
command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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:ce3bde5118a41092f1b7048c85d14fb35237ed45
|
image: linuxkit/sysctl:ce3bde5118a41092f1b7048c85d14fb35237ed45
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
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.6
|
- alpine:3.7
|
||||||
|
@ -38,7 +38,7 @@ onboot:
|
|||||||
net: /run/netns/wg1
|
net: /run/netns/wg1
|
||||||
onshutdown:
|
onshutdown:
|
||||||
- name: test2
|
- name: test2
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
binds:
|
binds:
|
||||||
- /tmp:/tmp
|
- /tmp:/tmp
|
||||||
- /check.sh:/check.sh
|
- /check.sh:/check.sh
|
||||||
@ -54,7 +54,7 @@ services:
|
|||||||
- CAP_SETGID
|
- CAP_SETGID
|
||||||
- CAP_DAC_OVERRIDE
|
- CAP_DAC_OVERRIDE
|
||||||
- name: test
|
- name: test
|
||||||
image: alpine:3.6
|
image: alpine:3.7
|
||||||
net: /run/netns/wg1
|
net: /run/netns/wg1
|
||||||
pid: host
|
pid: host
|
||||||
capabilities:
|
capabilities:
|
||||||
|
Loading…
Reference in New Issue
Block a user