diff --git a/.github/actions/bump-builder-version/action.yaml b/.github/actions/bump-builder-version/action.yaml index ec93ffb532178..44ff0b34eebef 100644 --- a/.github/actions/bump-builder-version/action.yaml +++ b/.github/actions/bump-builder-version/action.yaml @@ -52,4 +52,4 @@ runs: shell: bash run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" - echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" \ No newline at end of file + echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml index 9a46a7adac4cb..fe71f5b83ecf6 100644 --- a/.github/workflows/bump-version.yaml +++ b/.github/workflows/bump-version.yaml @@ -22,7 +22,7 @@ jobs: run: | sed -i 's/\(milvusdb\/milvus:\)[^[:space:]]*/\1${{ inputs.imageTag }}/' deployments/docker/standalone/docker-compose.yml sed -i 's/\(milvusdb\/milvus:\)[^[:space:]]*/\1${{ inputs.imageTag }}/' deployments/binary/README.md - sed -i 's/\(milvusdb\/milvus:\)[^[:space:]]*-gpu/\1${{ inputs.imageTag }}-gpu/' deployments/docker/gpu/standalone/docker-compose.yml + sed -i 's/\(milvusdb\/milvus:\)[^[:space:]]*/\1${{ inputs.imageTag }}-gpu/' deployments/docker/gpu/standalone/docker-compose.yml sed -i 's/\(milvusdb\/milvus:\)[^[:space:]]*/\1${{ inputs.imageTag }}/' deployments/docker/cluster-distributed-deployment/inventory.ini git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 8f36ce6dc5b69..bd76592588489 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM ubuntu:focal-20220426 +FROM ubuntu:20.04 ARG TARGETARCH diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index 7802c97519b58..8dc150ef4f37e 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM ubuntu:jammy-20240530 +FROM ubuntu:22.04 ARG TARGETARCH diff --git a/build/docker/heaptrack/Dockerfile b/build/docker/heaptrack/Dockerfile index 51cbedebf984c..b26895edc4f95 100644 --- a/build/docker/heaptrack/Dockerfile +++ b/build/docker/heaptrack/Dockerfile @@ -33,7 +33,7 @@ RUN cd /opt/heaptrack/build && \ RUN rm -rf /opt/heaptrack -FROM ubuntu:bionic-20200921 +FROM ubuntu:18.04 COPY --from=build /usr/local/bin/heaptrack /opt/heaptrack/bin/heaptrack COPY --from=build /usr/local/lib/heaptrack /opt/heaptrack/lib/heaptrack diff --git a/build/docker/meta-migration/Dockerfile b/build/docker/meta-migration/Dockerfile index 51215b35053f9..b2a5d880faa3d 100644 --- a/build/docker/meta-migration/Dockerfile +++ b/build/docker/meta-migration/Dockerfile @@ -10,7 +10,7 @@ # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM ubuntu:focal-20220426 +FROM ubuntu:20.04 COPY ./bin/meta-migration /milvus/bin/ diff --git a/build/docker/meta-migration/builder/Dockerfile b/build/docker/meta-migration/builder/Dockerfile index f299854cb60c9..3ddae18a2d7b4 100644 --- a/build/docker/meta-migration/builder/Dockerfile +++ b/build/docker/meta-migration/builder/Dockerfile @@ -1,2 +1,2 @@ -FROM golang:1.21.11-alpine3.19 +FROM golang:1.22.8-alpine3.19 RUN apk add --no-cache make bash \ No newline at end of file diff --git a/build/docker/milvus/ubuntu22.04/Dockerfile b/build/docker/milvus/ubuntu22.04/Dockerfile index a7da1252da644..92d5da9d15496 100644 --- a/build/docker/milvus/ubuntu22.04/Dockerfile +++ b/build/docker/milvus/ubuntu22.04/Dockerfile @@ -9,7 +9,7 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM ubuntu:jammy-20240530 +FROM ubuntu:22.04 ARG TARGETARCH ARG MILVUS_ASAN_LIB diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt index 1189a9b21d3d8..8670a4b160897 100644 --- a/internal/core/thirdparty/knowhere/CMakeLists.txt +++ b/internal/core/thirdparty/knowhere/CMakeLists.txt @@ -14,7 +14,7 @@ # Update KNOWHERE_VERSION for the first occurrence milvus_add_pkg_config("knowhere") set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES "") -set( KNOWHERE_VERSION b3a76d1 ) +set( KNOWHERE_VERSION de95 ) set( GIT_REPOSITORY "https://github.com/zilliztech/knowhere.git") message(STATUS "Knowhere repo: ${GIT_REPOSITORY}") message(STATUS "Knowhere version: ${KNOWHERE_VERSION}") @@ -42,7 +42,7 @@ set( CMAKE_PREFIX_PATH ${CONAN_BOOST_ROOT} ) FetchContent_Declare( knowhere GIT_REPOSITORY ${GIT_REPOSITORY} - GIT_TAG ${KNOWHERE_VERSION} + GIT_TAG de95 SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-src BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-build DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} )