mirror of
https://github.com/linka-cloud/d2vm.git
synced 2024-11-21 23:36:25 +00:00
fix Alpine 3.17 support (close #16)
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
parent
c66595115f
commit
8659907d62
@ -121,6 +121,12 @@ func TestSyslinuxCfg(t *testing.T) {
|
||||
initrd: "/initrd.img",
|
||||
sysconfig: syslinuxCfgDebian,
|
||||
},
|
||||
{
|
||||
image: "alpine:3.16",
|
||||
kernel: "/boot/vmlinuz-virt",
|
||||
initrd: "/boot/initramfs-virt",
|
||||
sysconfig: syslinuxCfgAlpine,
|
||||
},
|
||||
{
|
||||
image: "alpine",
|
||||
kernel: "/boot/vmlinuz-virt",
|
||||
|
@ -60,6 +60,7 @@ var (
|
||||
if parts := strings.Split(img, ":"); len(parts) > 1 {
|
||||
img, tag = parts[0], parts[1]
|
||||
}
|
||||
img = fmt.Sprintf("%s:%s", img, tag)
|
||||
size, err := parseSize(size)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -75,9 +76,9 @@ var (
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
found = len(imgs) == 1 && imgs[0] == fmt.Sprintf("%s:%s", img, tag)
|
||||
found = len(imgs) == 1 && imgs[0] == img
|
||||
if found {
|
||||
logrus.Infof("using local image %s:%s", img, tag)
|
||||
logrus.Infof("using local image %s", img)
|
||||
}
|
||||
}
|
||||
if pull || !found {
|
||||
|
@ -6,7 +6,14 @@ RUN apk update --no-cache && \
|
||||
apk add \
|
||||
util-linux \
|
||||
linux-virt \
|
||||
{{ if ge .Release.VersionID "3.17" }} \
|
||||
busybox-openrc \
|
||||
busybox-mdev-openrc \
|
||||
busybox-extras-openrc \
|
||||
busybox-mdev-openrc \
|
||||
{{ else }}
|
||||
busybox-initscripts \
|
||||
{{ end }}
|
||||
openrc
|
||||
|
||||
RUN for s in bootmisc hostname hwclock modules networking swap sysctl urandom syslog; do rc-update add $s boot; done
|
||||
|
Loading…
Reference in New Issue
Block a user