opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11543 from zexi/automated-cherry-pick-of-#11542-upstream-master

Browse Source 
Automated cherry pick of #11542: fix(climc): update climc-base image to 20210701
This commit is contained in:
Zexi Li
2021-07-02 11:28:33 +08:00
committed by GitHub
parent a4a04866a7 3b06b4c0ef
commit 681be2df90
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/docker/Dockerfile.climc
+1 -1
View File
@@ -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
build/docker/Makefile
+4 -2
View File
@@ -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