From 49807175fea6b849cc4c1a653247af4e0765ebb4 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Wed, 12 May 2021 09:04:52 +0800 Subject: [PATCH] fix: resolve conflict of climc docker build --- .../root/{etc/profile.d => opt/yunion/scripts/motd}/climc.sh | 0 build/docker/Dockerfile.climc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename build/climc/root/{etc/profile.d => opt/yunion/scripts/motd}/climc.sh (100%) diff --git a/build/climc/root/etc/profile.d/climc.sh b/build/climc/root/opt/yunion/scripts/motd/climc.sh similarity index 100% rename from build/climc/root/etc/profile.d/climc.sh rename to build/climc/root/opt/yunion/scripts/motd/climc.sh diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc index fa5b0da53b..ed04c678a7 100644 --- a/build/docker/Dockerfile.climc +++ b/build/docker/Dockerfile.climc @@ -2,6 +2,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210508 ADD ./build/climc/root/opt /opt -ADD ./build/climc/root/root /root +RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/