mirror of https://github.com/milvus-io/milvus.git
Fix cache path for 20.04 (#18859)
Signed-off-by: Jenny Li <jing.li@zilliz.com> Signed-off-by: Jenny Li <jing.li@zilliz.com>pull/18864/head
parent
69c0b2fb49
commit
c4a9e13e03
6
.env
6
.env
|
@ -1,8 +1,8 @@
|
|||
IMAGE_REPO=milvusdb
|
||||
IMAGE_ARCH=amd64
|
||||
OS_NAME=ubuntu20.04
|
||||
DATE_VERSION=20220825-0bb6526
|
||||
LATEST_DATE_VERSION=20220825-0bb6526
|
||||
DATE_VERSION=20220826-9e80a5d
|
||||
LATEST_DATE_VERSION=20220826-9e80a5d
|
||||
MINIO_ADDRESS=minio:9000
|
||||
PULSAR_ADDRESS=pulsar://pulsar:6650
|
||||
ETCD_ENDPOINTS=etcd:2379
|
||||
ETCD_ENDPOINTS=etcd:2379
|
|
@ -67,7 +67,7 @@ jobs:
|
|||
git commit -m "Update Builder image changes"
|
||||
- name: Create Pull Request
|
||||
id: cpr
|
||||
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' && matrix.os == 'ubuntu18.04'
|
||||
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' && matrix.os == 'ubuntu20.04'
|
||||
continue-on-error: true
|
||||
uses: peter-evans/create-pull-request@v3
|
||||
with:
|
||||
|
@ -79,10 +79,10 @@ jobs:
|
|||
title: '[automated] Update Builder image changes'
|
||||
body: |
|
||||
Update Builder image changes
|
||||
|
||||
See changes: https://github.com/milvus-io/milvus/commit/${{ github.sha }}
|
||||
Signed-off-by: ${{ github.actor }} ${{ github.actor }}@users.noreply.github.com
|
||||
- name: Check outputs
|
||||
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' && matrix.os == 'ubuntu18.04'
|
||||
if: success() && github.event_name == 'push' && github.repository == 'milvus-io/milvus' && matrix.os == 'ubuntu20.04'
|
||||
run: |
|
||||
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||
|
|
|
@ -24,7 +24,7 @@ set -x
|
|||
# Absolute path to the toplevel milvus directory.
|
||||
toplevel=$(dirname "$(cd "$(dirname "${0}")"; pwd)")
|
||||
|
||||
OS_NAME="${OS_NAME:-ubuntu18.04}"
|
||||
OS_NAME="${OS_NAME:-ubuntu20.04}"
|
||||
MILVUS_IMAGE_REPO="${MILVUS_IMAGE_REPO:-milvusdb/milvus}"
|
||||
MILVUS_IMAGE_TAG="${MILVUS_IMAGE_TAG:-latest}"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ set -euo pipefail
|
|||
# Absolute path to the toplevel milvus directory.
|
||||
toplevel=$(dirname "$(cd "$(dirname "${0}")"; pwd)")
|
||||
|
||||
export OS_NAME="${OS_NAME:-ubuntu18.04}"
|
||||
export OS_NAME="${OS_NAME:-ubuntu20.04}"
|
||||
|
||||
pushd "${toplevel}"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
|
|||
wget -qO- "https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
g++ gcc gfortran git make ccache libssl-dev zlib1g-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev \
|
||||
libboost-filesystem-dev libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev libtbb-dev clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake && \
|
||||
libboost-filesystem-dev libboost-serialization-dev python3-dev libboost-python-dev libcurl4-openssl-dev libtbb-dev clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python && \
|
||||
apt-get remove --purge -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
FROM milvusdb/openblas:ubuntu20.04-20220825-4feedf1 AS openblas
|
||||
|
||||
#FROM alpine
|
||||
FROM ubuntu:ubuntu:focal-20220426
|
||||
FROM ubuntu:focal-20220426
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends libtbb-dev gfortran netcat iputils-ping ca-certificates && \
|
||||
|
|
Loading…
Reference in New Issue