From d5fbca1e4fc7f97ec5798dad3fd212f94e50ba23 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Sat, 16 Jul 2022 12:26:35 +0800 Subject: [PATCH] feat(baremetal): update base image to support lvm (#14650) --- build/docker/Dockerfile.baremetal-agent | 2 +- build/docker/Dockerfile.baremetal-base | 4 +++- build/docker/Makefile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/docker/Dockerfile.baremetal-agent b/build/docker/Dockerfile.baremetal-agent index f169b99929..f5b19e603a 100644 --- a/build/docker/Dockerfile.baremetal-agent +++ b/build/docker/Dockerfile.baremetal-agent @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.6 +FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.7 MAINTAINER "Zexi Li " diff --git a/build/docker/Dockerfile.baremetal-base b/build/docker/Dockerfile.baremetal-base index dc1c6b15a9..c22962f273 100644 --- a/build/docker/Dockerfile.baremetal-base +++ b/build/docker/Dockerfile.baremetal-base @@ -1,10 +1,12 @@ #FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build #RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm #RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm -FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.4 as yunionos +FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.5 as yunionos FROM centos:8 as grub-stage +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* +RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* RUN dnf install -y grub2* # make grub_booti386 firmware diff --git a/build/docker/Makefile b/build/docker/Makefile index c7da02b039..4bbfe43151 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -30,7 +30,7 @@ WEBCONSOLE_BASE_VERSION = v0.2-1 webconsole-base: $(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base . -BAREMETAL_BASE_VERSION = v0.3.6 +BAREMETAL_BASE_VERSION = v0.3.7 baremetal-base: $(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .