Skip to content

Commit 5f16a06

Browse files
committed
fix vault address for aarch64
1 parent 8854931 commit 5f16a06

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

docker/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ ARG TARGETARCH
2121

2222
LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB
2323

24-
COPY setup_deps.sh /
24+
COPY ./*.sh /
2525
# hadolint ignore=DL3031,DL3033
2626
RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
2727
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
2828
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
2929
yum update -y && yum install -y centos-release-scl epel-release && \
30-
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
31-
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
32-
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \
30+
/patch_yum_repo.sh && \
3331
yum install -y devtoolset-8 rh-git227 devtoolset-8-libasan-devel flex doxygen java-1.8.0-openjdk-devel rh-python38-python-devel rh-python38-python-wheel rh-python38-python-requests rh-python38-python-pip && \
3432
curl -Lo lcov-1.15-1.noarch.rpm https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15-1.noarch.rpm && \
3533
yum localinstall -y lcov-1.15-1.noarch.rpm && \
@@ -39,7 +37,7 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
3937
tar xzf zookeeper.tar.gz -C /deps/src && \
4038
rm -v ./*.tar.gz && \
4139
/setup_deps.sh -a "$TARGETARCH" -z "$ZETASQL_VERSION" -t "$THIRDPARTY_VERSION" && \
42-
rm -v /setup_deps.sh
40+
rm -v /*.sh
4341

4442
ENV THIRD_PARTY_DIR=/deps/usr
4543
ENV THIRD_PARTY_SRC_DIR=/deps/src

docker/patch_yum_repo.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
6+
sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
7+
sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
8+
9+
if [[ "$ARCH" = "aarch64" ]]; then
10+
sed -i s/vault.centos.org\\/centos/vault.centos.org\\/altarch/g /etc/yum.repos.d/*.repo
11+
fi

0 commit comments

Comments
 (0)