diff --git a/base-image/Dockerfile b/base-image/Dockerfile index f35b541..0e70031 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -1,9 +1,5 @@ FROM ubuntu:20.04 AS build -RUN sed -i s@/archive.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \ - sed -i s@/security.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \ - apt-get clean - RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ wget \ @@ -84,10 +80,6 @@ RUN cd /cvm-agent/cvmassistants/attest-helper \ # Final image FROM ubuntu:20.04 -RUN sed -i s@/archive.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \ - sed -i s@/security.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \ - apt-get clean - RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ wget \ @@ -161,9 +153,6 @@ COPY --from=build /cvm-agent/cvmassistants/secretprovider/secret-provider-agent #RUN echo "export LD_LIBRARY_PATH=/usr/local/lib/rats-tls:$LD_LIBRARY_PATH" >> /etc/profile #config supervisord -#RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ -# sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ -# apt-get clean RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ supervisor \ diff --git a/cvmassistants/keyprovider/key-broker-server/docker/Dockerfile b/cvmassistants/keyprovider/key-broker-server/docker/Dockerfile index 786587d..b0ad05d 100644 --- a/cvmassistants/keyprovider/key-broker-server/docker/Dockerfile +++ b/cvmassistants/keyprovider/key-broker-server/docker/Dockerfile @@ -1,8 +1,4 @@ -FROM ubuntu:20.04 as build - -#RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ -# sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ -# apt-get clean +FROM ubuntu:20.04 AS build RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -48,14 +44,6 @@ RUN cd /root \ FROM ubuntu:20.04 -RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - apt-get clean - -#RUN mkdir -p /usr/share/zoneinfo/ -#COPY /usr/share/zoneinfo /usr/share/zoneinfo -#RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ libssl-dev \ @@ -88,4 +76,3 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/rats-tls WORKDIR /workplace/app ENTRYPOINT ["/workplace/app/key_broker_server"] CMD [] - diff --git a/cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile b/cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile index 9371943..a196a4f 100644 --- a/cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile +++ b/cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile @@ -1,8 +1,4 @@ -FROM ubuntu:20.04 as build - -RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - apt-get clean +FROM ubuntu:20.04 AS build RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -49,14 +45,6 @@ RUN cd /root \ FROM ubuntu:20.04 -RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \ - apt-get clean - -#RUN mkdir -p /usr/share/zoneinfo/ -#COPY /usr/share/zoneinfo /usr/share/zoneinfo -#RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime - RUN apt-get update \ && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ libssl-dev \ @@ -86,4 +74,3 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/rats-tls WORKDIR /workplace/app ENTRYPOINT ["/workplace/app/secret_broker_server"] CMD [] - diff --git a/release-please-config.json b/release-please-config.json index 90e0cf6..be07df7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,5 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "always-update": true, "draft-pull-request": true, "include-component-in-tag": false, "include-v-in-tag": true,