Skip to content

Commit 46dd5b3

Browse files
authored
refactor: keep canonical official mirrors to install packages (#27)
1 parent 1b853be commit 46dd5b3

File tree

4 files changed

+3
-39
lines changed

4 files changed

+3
-39
lines changed

base-image/Dockerfile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
FROM ubuntu:20.04 AS build
22

3-
RUN sed -i s@/archive.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \
4-
sed -i s@/security.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \
5-
apt-get clean
6-
73
RUN apt-get update \
84
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
95
wget \
@@ -84,10 +80,6 @@ RUN cd /cvm-agent/cvmassistants/attest-helper \
8480
# Final image
8581
FROM ubuntu:20.04
8682

87-
RUN sed -i s@/archive.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \
88-
sed -i s@/security.ubuntu.com/@/mirror.ubuntu.ikoula.com/@g /etc/apt/sources.list && \
89-
apt-get clean
90-
9183
RUN apt-get update \
9284
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
9385
wget \
@@ -161,9 +153,6 @@ COPY --from=build /cvm-agent/cvmassistants/secretprovider/secret-provider-agent
161153
#RUN echo "export LD_LIBRARY_PATH=/usr/local/lib/rats-tls:$LD_LIBRARY_PATH" >> /etc/profile
162154

163155
#config supervisord
164-
#RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
165-
# sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
166-
# apt-get clean
167156
RUN apt-get update \
168157
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
169158
supervisor \

cvmassistants/keyprovider/key-broker-server/docker/Dockerfile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
FROM ubuntu:20.04 as build
2-
3-
#RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
4-
# sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
5-
# apt-get clean
1+
FROM ubuntu:20.04 AS build
62

73
RUN apt-get update \
84
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -48,14 +44,6 @@ RUN cd /root \
4844

4945
FROM ubuntu:20.04
5046

51-
RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
52-
sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
53-
apt-get clean
54-
55-
#RUN mkdir -p /usr/share/zoneinfo/
56-
#COPY /usr/share/zoneinfo /usr/share/zoneinfo
57-
#RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
58-
5947
RUN apt-get update \
6048
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
6149
libssl-dev \
@@ -88,4 +76,3 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/rats-tls
8876
WORKDIR /workplace/app
8977
ENTRYPOINT ["/workplace/app/key_broker_server"]
9078
CMD []
91-

cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
FROM ubuntu:20.04 as build
2-
3-
RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
4-
sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
5-
apt-get clean
1+
FROM ubuntu:20.04 AS build
62

73
RUN apt-get update \
84
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -49,14 +45,6 @@ RUN cd /root \
4945

5046
FROM ubuntu:20.04
5147

52-
RUN sed -i s@/archive.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
53-
sed -i s@/security.ubuntu.com/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list && \
54-
apt-get clean
55-
56-
#RUN mkdir -p /usr/share/zoneinfo/
57-
#COPY /usr/share/zoneinfo /usr/share/zoneinfo
58-
#RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
59-
6048
RUN apt-get update \
6149
&& env DEBIAN_FRONTEND=noninteractive apt-get install -y \
6250
libssl-dev \
@@ -86,4 +74,3 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/rats-tls
8674
WORKDIR /workplace/app
8775
ENTRYPOINT ["/workplace/app/secret_broker_server"]
8876
CMD []
89-

release-please-config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"always-update": true,
34
"draft-pull-request": true,
45
"include-component-in-tag": false,
56
"include-v-in-tag": true,

0 commit comments

Comments
 (0)