use the compile env as the runtime env in monitoring and lifecycle container.

Signed-off-by: Cao Xueliang caoxl78320@163.com --- container/lifecycle/Dockerfile | 4 ++-- container/monitoring/Dockerfile | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/container/lifecycle/Dockerfile b/container/lifecycle/Dockerfile index aa3e737..d8f8234 100644 --- a/container/lifecycle/Dockerfile +++ b/container/lifecycle/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.

-FROM alpine:3.11 +FROM alpine:scheduler-dev

MAINTAINER Wu Zhende wuzhende666@163.com

@@ -13,7 +13,7 @@ RUN apk update && \

RUN umask 002 && \ gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ - gem install rest-client activesupport git json yaml + gem install yaml

ENV LIFECYCLE_RUNTIME_DIR /c/cci/lifecycle

diff --git a/container/monitoring/Dockerfile b/container/monitoring/Dockerfile index 0a5dc22..80d2ec9 100644 --- a/container/monitoring/Dockerfile +++ b/container/monitoring/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:scheduler-dev

RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com%7Cg' /etc/apk/repositories

@@ -9,10 +9,6 @@ RUN apk add --no-cache 'ruby-dev' \

RUN umask 002 && \ gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ - gem install rest-client && \ - gem install activesupport && \ - gem install git && \ - gem install json && \ gem install yaml