From 938cc12aadea2b6ab028a9891ec63204a8819c0f Mon Sep 17 00:00:00 2001 From: mirito333 Date: Thu, 12 Sep 2024 10:55:41 +0900 Subject: [PATCH] feat: impl usearch istallation cmd for ci/base container --- dockers/ci/base/Dockerfile | 1 + hack/actions/gen/main.go | 3 ++- hack/docker/gen/main.go | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 09fccb1e35..3ee2d9b83c 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -120,6 +120,7 @@ RUN --mount=type=bind,target=.,rw \ && make telepresence/install \ && make ngt/install \ && make faiss/install \ + && make usearch/install \ && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/* # skipcq: DOK-DL3002 USER root:root diff --git a/hack/actions/gen/main.go b/hack/actions/gen/main.go index d5be92145f..b828885289 100644 --- a/hack/actions/gen/main.go +++ b/hack/actions/gen/main.go @@ -313,6 +313,7 @@ const ( rustVersionPath = versionsPath + "/RUST_VERSION" faissVersionPath = versionsPath + "/FAISS_VERSION" ngtVersionPath = versionsPath + "/NGT_VERSION" + usearchVersionPath = versionsPath + "/USEARCH_VERSION" makefilePath = "Makefile" makefileDirPath = "Makefile.d/**" @@ -646,7 +647,7 @@ func main() { append(ngtBuildDeps, append(faissBuildDeps, devContainerDeps...)...)...)...), - Preprocess: append(ciContainerPreprocess, ngtPreprocess, faissPreprocess), + Preprocess: append(ciContainerPreprocess, ngtPreprocess, faissPreprocess,), Entrypoints: []string{"/bin/bash"}, }, "vald-dev-container": { diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go index 7750270efc..3c65ac4c26 100644 --- a/hack/docker/gen/main.go +++ b/hack/docker/gen/main.go @@ -241,8 +241,9 @@ const ( agentInernalPackage = "pkg/agent/internal" - ngtPreprocess = "make ngt/install" - faissPreprocess = "make faiss/install" + ngtPreprocess = "make ngt/install" + faissPreprocess = "make faiss/install" + usearchPreprocess = "make usearch/install" helmOperatorRootdir = "/opt/helm" helmOperatorWatchFile = helmOperatorRootdir + "/watches.yaml" @@ -645,7 +646,7 @@ func main() { append(ngtBuildDeps, append(faissBuildDeps, devContainerDeps...)...)...)...), - Preprocess: append(ciContainerPreprocess, ngtPreprocess, faissPreprocess), + Preprocess: append(ciContainerPreprocess, ngtPreprocess, faissPreprocess, usearchPreprocess), Entrypoints: []string{"/bin/bash"}, }, "vald-dev-container": {