From f587a427bf122aca81532cd5cfde79d0e5cdea14 Mon Sep 17 00:00:00 2001 From: iceBear67 Date: Mon, 22 Jun 2026 13:58:03 +0800 Subject: [PATCH] unify alpine version --- hypervisor.Dockerfile | 2 +- image/overlay/etc/network/interfaces | 1 - vm.Dockerfile | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hypervisor.Dockerfile b/hypervisor.Dockerfile index 29da0ea..2575d75 100644 --- a/hypervisor.Dockerfile +++ b/hypervisor.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest AS hypervisor +FROM alpine:3.24.1 AS hypervisor ADD ./scripts/setup-hypervisor.sh /setup.sh # Download cloud hypervisor RUN apk update && apk add bash curl jq tini linux-virt && sh /setup.sh && rm /setup.sh && mkdir /app diff --git a/image/overlay/etc/network/interfaces b/image/overlay/etc/network/interfaces index 9d986a6..790f947 100644 --- a/image/overlay/etc/network/interfaces +++ b/image/overlay/etc/network/interfaces @@ -3,5 +3,4 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp - pre-up modprobe af_packet post-up ip route del default || true; ip route add default via GATEWAY_ADDRESS diff --git a/vm.Dockerfile b/vm.Dockerfile index f0cc570..cc744f3 100644 --- a/vm.Dockerfile +++ b/vm.Dockerfile @@ -10,7 +10,7 @@ RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \ go build -o /build/auth_server ./util/ -FROM alpine:latest AS rootfs-builder +FROM alpine:3.24.1 AS rootfs-builder ENV CLOUD_CONFIG_REPO="https://git.sfclub.cc/cloud/bearnet" ENV CLOUD_CONFIG_REVISION="wish" ENV CLOUD_GATEWAY_ADDRESS="10.0.0.119" @@ -23,7 +23,7 @@ COPY --from=bubble-builder /build/daemon /bin/bubble COPY --from=bubble-builder /build/auth_server /bin/auth-server RUN --security=insecure \ --mount=type=bind,from=host-modules,source=/,target=/lib/modules \ - cd /kitchen && rm -f vm.raw && ./build-image.sh + cd /kitchen && rm -f vm.raw && ALPINE_BRANCH="3.24.1" ./build-image.sh FROM scratch AS export COPY --from=rootfs-builder /kitchen/vm.raw /vm.raw