Merge pull request #3702 from deitch/alpine-314

bump alpine to 3.14, remove go version hack
This commit is contained in:
Avi Deitcher
2021-11-16 14:56:01 +02:00
committed by GitHub
236 changed files with 1586 additions and 1593 deletions

View File

@@ -2,16 +2,16 @@ kernel:
image: linuxkit/kernel:5.10.76
cmdline: "console=ttyS0"
init:
- linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de
- linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1
- linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816
- linuxkit/init:eb597ef74d808b5320ad1060b1620a6ac31e7ced
- linuxkit/runc:21dbbda709ae138de0af6b0c7e4ae49525db5e88
- linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
onboot:
- name: ltp
image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd
binds:
- /etc/ltp/baseline:/etc/ltp/baseline
- name: poweroff
image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c
files:
- path: /etc/ltp/baseline
contents: "100"

View File

@@ -4,15 +4,15 @@ kernel:
image: linuxkit/kernel:5.10.76
cmdline: "console=ttyS0"
init:
- linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de
- linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1
- linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816
- linuxkit/init:eb597ef74d808b5320ad1060b1620a6ac31e7ced
- linuxkit/runc:21dbbda709ae138de0af6b0c7e4ae49525db5e88
- linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:1033f340e2d42f86a60aab70752346f0045ea388
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: check-kernel-config
image: linuxkit/test-kernel-config:b916af1ec0ed92efb13b25899ef9e43970dab1c2
image: linuxkit/test-kernel-config:41aa03790ea637624a3f9737187e0c878766474b
- name: poweroff
image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
image: linuxkit/poweroff:39d99e5909b6f8faccedc78d6d2646cdb6c9ed9c
command: ["/bin/sh", "/poweroff.sh", "120"]