Skip to content

refactor: keep canonical official mirrors to install packages #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbern0rd merged 1 commit into from
Oct 27, 2025
Merged

refactor: keep canonical official mirrors to install packages #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions base-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
15 changes: 1 addition & 14 deletions cvmassistants/keyprovider/key-broker-server/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 []

15 changes: 1 addition & 14 deletions cvmassistants/secretprovider/secret-broker-server/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 []

1 change: 1 addition & 0 deletions release-please-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down