Fix amazonlinux cache not work (#26883)

Signed-off-by: Enwei Jiao <enwei.jiao@zilliz.com>
pull/26911/head
Enwei Jiao 2023-09-07 15:43:15 +08:00 committed by GitHub
parent 8dfa832fa0
commit 2a755baaa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 24 deletions

2
.env
View File

@ -2,7 +2,7 @@ IMAGE_REPO=milvusdb
IMAGE_ARCH=amd64
OS_NAME=ubuntu20.04
DATE_VERSION=20230830-30ca458
LATEST_DATE_VERSION=20230830-30ca458
LATEST_DATE_VERSION=20230823-32307db
GPU_DATE_VERSION=20230822-a64488a
LATEST_GPU_DATE_VERSION=20230317-a1c7b0c
MINIO_ADDRESS=minio:9000

View File

@ -107,7 +107,6 @@ jobs:
key: amazonlinux2023-conan-${{ hashFiles('internal/core/conanfile.*') }}
restore-keys: amazonlinux2023-conan-
- name: Code Check
env:
OS_NAME: 'amazonlinux2023'
run: |
sed -i 's/ubuntu20.04/amazonlinux2023/g' .env
./build/builder.sh /bin/bash -c "make install"

View File

@ -9,8 +9,6 @@ if [[ -f "$toplevel/.env" ]]; then
export $(cat $toplevel/.env | xargs)
fi
export OS_NAME="${OS_NAME:-ubuntu20.04}"
pushd "${toplevel}"
if [[ "${1-}" == "pull" ]]; then
@ -27,8 +25,6 @@ PLATFORM_ARCH="${PLATFORM_ARCH:-${IMAGE_ARCH}}"
export IMAGE_ARCH=${PLATFORM_ARCH}
echo ${IMAGE_ARCH}
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-ccache"
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-go-mod"
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-vscode-extensions"

View File

@ -13,7 +13,7 @@ FROM amazonlinux:2023
ARG TARGETARCH
RUN yum install -y wget g++ gcc gdb libstdc++-static git make zip unzip tar which \
RUN yum install -y wget g++ gcc gdb libatomic libstdc++-static git make zip unzip tar which \
autoconf automake golang python3 python3-pip perl-FindBin texinfo \
pkg-config libuuid-devel libaio && \
rm -rf /var/cache/yum/*
@ -21,23 +21,14 @@ RUN yum install -y wget g++ gcc gdb libstdc++-static git make zip unzip tar whic
RUN pip3 install conan==1.58.0
RUN echo "target arch $TARGETARCH"
RUN if [ "$TARGETARCH" = "amd64" ]; then CMAKE_SUFFIX=x86_64; else CMAKE_SUFFIX=aarch64; fi &&\
wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-$CMAKE_SUFFIX.tar.gz" | tar --strip-components=1 -xz -C /usr/local
RUN wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local
RUN mkdir /tmp/ccache && wget -qO- https://github.com/ccache/ccache/releases/download/v4.8.2/ccache-4.8.2.tar.gz | tar --strip-components=1 -xz -C /tmp/ccache &&\
cd /tmp/ccache && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. && make && make install &&\
RUN mkdir /tmp/ccache && cd /tmp/ccache &&\
wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/h/hiredis-1.0.2-1.el9.`uname -m`.rpm &&\
wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/c/ccache-4.5.1-2.el9.`uname -m`.rpm &&\
rpm -i hiredis-1.0.2-1.el9.`uname -m`.rpm ccache-4.5.1-2.el9.`uname -m`.rpm &&\
rm -rf /tmp/ccache
# https://github.com/golang/go/issues/22040 Due to this issue, ld.gold cannot be used in the ARM environment, so the official golang package cannot be used. You need to use the golang package that comes with yum.
# Install Go
# ENV GOPATH /go
# ENV GOROOT /usr/local/go
# ENV GO111MODULE on
# ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
# RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.20.7.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
# mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
# go clean --modcache && \
# chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)
# refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild
RUN mkdir -p /home/milvus/.vscode-server/extensions \

View File

@ -23,8 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
RUN pip3 install conan==1.58.0
RUN echo "target arch $TARGETARCH"
RUN if [ "$TARGETARCH" = "amd64" ]; then CMAKE_SUFFIX=x86_64; else CMAKE_SUFFIX=aarch64; fi &&\
wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.0-linux-$CMAKE_SUFFIX.tar.gz" | tar --strip-components=1 -xz -C /usr/local
RUN wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local
# Install Go
ENV GOPATH /go