From 3b06b4c0ef8de398b00764aa6d31574244ec29bf Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Fri, 2 Jul 2021 10:02:48 +0800 Subject: [PATCH] fix(climc): update climc-base image to 20210701 --- build/docker/Dockerfile.climc | 2 +- build/docker/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc index ed04c678a7..a0e0a5d988 100644 --- a/build/docker/Dockerfile.climc +++ b/build/docker/Dockerfile.climc @@ -1,4 +1,4 @@ -FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210508 +FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210701 ADD ./build/climc/root/opt /opt diff --git a/build/docker/Makefile b/build/docker/Makefile index c9e77eab93..8aa18021da 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -1,15 +1,17 @@ REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio" - DOCKER_BUILD = docker build -t $(REGISTRY) DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY) + debian10-base: docker buildx build --platform linux/arm64,linux/amd64 --push \ -t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base . +CLIMC_BASE_VERSION = 20210701 + climc-base: docker buildx build --platform linux/arm64,linux/amd64 --push \ - -t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(VERSION) -f ./Dockerfile.climc-base . + -t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base . BAREMETAL_BASE_VERSION = v0.3