yaml: Update use of alpine:3.11 to alpine:3.13

Seceral YAML files used alpine:3:11. Update them to 3.13

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2021-08-10 00:13:52 +01:00
parent ce73340d6c
commit 4eb60514c9
39 changed files with 42 additions and 42 deletions

View File

@ -7,7 +7,7 @@ linuxkit does not use the docker image cache to store these images. This is
for two key reasons. for two key reasons.
First, docker does not provide support for different architecture versions. For First, docker does not provide support for different architecture versions. For
example, if you want to pull down `docker.io/library/alpine:3.11` by manifest, example, if you want to pull down `docker.io/library/alpine:3.13` by manifest,
with its signature, but get the `arm64` version while you are on an `amd64` device, with its signature, but get the `arm64` version while you are on an `amd64` device,
it is not supported. it is not supported.
@ -40,7 +40,7 @@ Image names are kept in `index.json` in the [annotation](https://github.com/open
"size": 1638, "size": 1638,
"digest": "sha256:9a839e63dad54c3a6d1834e29692c8492d93f90c59c978c1ed79109ea4fb9a54", "digest": "sha256:9a839e63dad54c3a6d1834e29692c8492d93f90c59c978c1ed79109ea4fb9a54",
"annotations": { "annotations": {
"org.opencontainers.image.ref.name": "docker.io/library/alpine:3.11" "org.opencontainers.image.ref.name": "docker.io/library/alpine:3.13"
} }
} }
] ]

View File

@ -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.11 image: alpine:3.13
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.11 image: alpine:3.13
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"]

View File

@ -22,7 +22,7 @@ services:
- INSECURE=true - INSECURE=true
# A service which generates log messages for testing # A service which generates log messages for testing
- name: write-to-the-logs - name: write-to-the-logs
image: alpine:3.11 image: alpine:3.13
command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ] command: ["/bin/sh", "-c", "while /bin/true; do echo hello $(date); sleep 1; done" ]
- name: write-and-rotate-logs - name: write-and-rotate-logs
image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208

View File

@ -10,7 +10,7 @@ onboot:
image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
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.11 image: alpine:3.13
binds: binds:
- /var/:/host_var:rbind,rshared - /var/:/host_var:rbind,rshared
capabilities: capabilities:

View File

@ -17,7 +17,7 @@ COPY ./src/* ./
RUN make all RUN make all
# Package # Package
FROM alpine:3.11 FROM alpine:3.13
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"]

View File

@ -17,7 +17,7 @@ COPY ./src/* ./
RUN make all RUN make all
# Package # Package
FROM alpine:3.11 FROM alpine:3.13
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"]

View File

@ -17,7 +17,7 @@ COPY ./src/* ./
RUN make all RUN make all
# Package # Package
FROM alpine:3.11 FROM alpine:3.13
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"]

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
onboot: onboot:
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
readonly: true readonly: true
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -8,7 +8,7 @@ onboot:
- name: binfmt - name: binfmt
image: linuxkit/binfmt:5567917e7de481e4867d31c7490a0ebdb70e04a5 image: linuxkit/binfmt:5567917e7de481e4867d31c7490a0ebdb70e04a5
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
- /proc/sys/fs/binfmt_misc:/binfmt_misc - /proc/sys/fs/binfmt_misc:/binfmt_misc

View File

@ -7,7 +7,7 @@ init:
- linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0
onboot: onboot:
- name: bpftrace-test - name: bpftrace-test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
command: ["sh", "./check.sh"] command: ["sh", "./check.sh"]

View File

@ -7,7 +7,7 @@ init:
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
onboot: onboot:
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
- /etc:/host-etc - /etc:/host-etc

View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388 image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"] command: ["/usr/bin/crypto", "it_is_encrypted", "/dev/sda"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb image: linuxkit/dm-crypt:4daf2010d088955b42ba50db813226e4b3f773cb
command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"] command: ["/usr/bin/crypto", "-l", "it_is_encrypted", "/dev/sda"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
- /dev/:/dev - /dev/:/dev
- /some/other/enc_key:/some/other/enc_key - /some/other/enc_key:/some/other/enc_key
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -11,7 +11,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
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"]

View File

@ -11,7 +11,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -15,7 +15,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
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"]

View File

@ -15,7 +15,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
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"]

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
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"]

View File

@ -11,7 +11,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
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.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
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.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -15,7 +15,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -12,7 +12,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "/var/lib/docker"] command: ["/usr/bin/mountie", "/var/lib/docker"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -18,7 +18,7 @@ onboot:
image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb image: linuxkit/mount:71c868267a4503f99e84fd7698717a3669d9dfdb
command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /var/foo:/var/foo - /var/foo:/var/foo

View File

@ -22,7 +22,7 @@ trap clean_up EXIT
# generate our cdrom image # generate our cdrom image
ISOFILE=/tmp/cidata.iso ISOFILE=/tmp/cidata.iso
docker run -i --rm -v $(pwd)/geniso.sh:/geniso.sh:ro alpine:3.11 /geniso.sh > ${ISOFILE} docker run -i --rm -v $(pwd)/geniso.sh:/geniso.sh:ro alpine:3.13 /geniso.sh > ${ISOFILE}
linuxkit build -format kernel+initrd -name ${NAME} test.yml linuxkit build -format kernel+initrd -name ${NAME} test.yml
RESULT="$(linuxkit run -disk file=${DISK},size=32M -disk file=${ISOFILE} ${NAME})" RESULT="$(linuxkit run -disk file=${DISK},size=32M -disk file=${ISOFILE} ${NAME})"

View File

@ -8,7 +8,7 @@ onboot:
- name: metadata - name: metadata
image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d image: linuxkit/metadata:91125438842110e7709811997815b7b33dc18d1d
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
- /run:/run - /run:/run

View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/losetup:db35344a21e44a55195540a8670886f60aa77201 image: linuxkit/losetup:db35344a21e44a55195540a8670886f60aa77201
command: ["/usr/bin/loopy", "-c", "/var/test.img"] command: ["/usr/bin/loopy", "-c", "/var/test.img"]
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -8,7 +8,7 @@ onboot:
- name: sysctl - name: sysctl
image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a image: linuxkit/sysctl:02d2bd74509fd063857ceb4c4f502f09ee4f2e0a
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
net: host net: host
pid: host pid: host
ipc: host ipc: host

View File

@ -8,7 +8,7 @@ init:
- linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a
services: services:
- name: test - name: test
image: alpine:3.11 image: alpine:3.13
pid: host pid: host
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh

View File

@ -38,7 +38,7 @@ onboot:
net: /run/netns/wg1 net: /run/netns/wg1
onshutdown: onshutdown:
- name: test2 - name: test2
image: alpine:3.11 image: alpine:3.13
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.11 image: alpine:3.13
net: /run/netns/wg1 net: /run/netns/wg1
pid: host pid: host
capabilities: capabilities:

View File

@ -16,7 +16,7 @@ services:
image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208
command: ["/usr/bin/logwrite", "-max-log-size", "1024"] command: ["/usr/bin/logwrite", "-max-log-size", "1024"]
- name: check-the-logs - name: check-the-logs
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
- /dev/console:/dev/console - /dev/console:/dev/console

View File

@ -13,7 +13,7 @@ services:
- name: write-and-rotate-logs - name: write-and-rotate-logs
image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208 image: linuxkit/logwrite:e64e0f06e485e3542b58f3517da3bc13f246d208
- name: check-the-logs - name: check-the-logs
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
- /dev/console:/dev/console - /dev/console:/dev/console

View File

@ -7,7 +7,7 @@ init:
- linuxkit/kernel-bcc:5.4.113 - linuxkit/kernel-bcc:5.4.113
onboot: onboot:
- name: check-bcc - name: check-bcc
image: alpine:3.11 image: alpine:3.13
binds: binds:
- /check.sh:/check.sh - /check.sh:/check.sh
command: ["sh", "./check.sh"] command: ["sh", "./check.sh"]