diff --git a/dockers/agent/core/agent/Dockerfile b/dockers/agent/core/agent/Dockerfile index f3195dde427..eb6a7bfa832 100644 --- a/dockers/agent/core/agent/Dockerfile +++ b/dockers/agent/core/agent/Dockerfile @@ -70,6 +70,7 @@ RUN --mount=type=bind,target=.,rw \ libomp-dev \ libopenblas-dev \ gfortran \ + pkg-config \ && ldconfig \ && echo "${LANG} UTF-8" > /etc/locale.gen \ && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ @@ -91,4 +92,4 @@ LABEL maintainer="vdaas.org vald team " COPY --from=builder /usr/bin/agent /usr/bin/agent # skipcq: DOK-DL3002 USER nonroot:nonroot -ENTRYPOINT ["/usr/bin/agent"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/agent"] diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 09fccb1e35e..b1b1f4c5900 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -78,6 +78,7 @@ RUN --mount=type=bind,target=.,rw \ libomp-dev \ libopenblas-dev \ gfortran \ + pkg-config \ gawk \ gnupg2 \ graphviz \ @@ -123,4 +124,4 @@ RUN --mount=type=bind,target=.,rw \ && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/* # skipcq: DOK-DL3002 USER root:root -ENTRYPOINT ["/bin/bash"] \ No newline at end of file +ENTRYPOINT ["/bin/bash"] diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 502f386e973..1596ef3c39f 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -44,8 +44,8 @@ ENV REPO=vald ENV RUST_HOME=/usr/loacl/lib/rust ENV TZ=Etc/UTC ENV USER=root -ENV CARGO_HOME=${RUST_HOME}/cargo ENV RUSTUP_HOME=${RUST_HOME}/rustup +ENV CARGO_HOME=${RUST_HOME}/cargo ENV PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -83,6 +83,7 @@ RUN --mount=type=bind,target=.,rw \ libomp-dev \ libopenblas-dev \ gfortran \ + pkg-config \ gawk \ gnupg2 \ graphviz \ @@ -142,4 +143,4 @@ RUN --mount=type=bind,target=.,rw \ && make faiss/install \ && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/* # skipcq: DOK-DL3002 -USER root:root \ No newline at end of file +USER root:root diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go index 7750270efc8..6eb8377a3be 100644 --- a/hack/docker/gen/main.go +++ b/hack/docker/gen/main.go @@ -345,6 +345,9 @@ var ( faissBuildDeps = []string{ "gfortran", } + rustBuildDeps = []string{ + "pkg-config", + } devContainerDeps = []string{ "gawk", "gnupg2", @@ -527,7 +530,8 @@ func main() { RuntimeImage: "gcr.io/distroless/cc-debian12", ExtraPackages: append(clangBuildDeps, append(ngtBuildDeps, - faissBuildDeps...)...), + append(faissBuildDeps, + rustBuildDeps...)...)...), Preprocess: []string{ ngtPreprocess, faissPreprocess, @@ -644,7 +648,8 @@ func main() { ExtraPackages: append([]string{"npm"}, append(clangBuildDeps, append(ngtBuildDeps, append(faissBuildDeps, - devContainerDeps...)...)...)...), + append(rustBuildDeps, + devContainerDeps...)...)...)...)...), Preprocess: append(ciContainerPreprocess, ngtPreprocess, faissPreprocess), Entrypoints: []string{"/bin/bash"}, }, @@ -659,7 +664,8 @@ func main() { ExtraPackages: append(clangBuildDeps, append(ngtBuildDeps, append(faissBuildDeps, - devContainerDeps...)...)...), + append(rustBuildDeps, + devContainerDeps...)...)...)...), Preprocess: append(devContainerPreprocess, append(ciContainerPreprocess, ngtPreprocess,