add pkg-config

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Sep 12, 2024 · 5c4a0c0 · 5c4a0c0
1 parent f93381c
commit 5c4a0c0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git 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 <[email protected]>"
 COPY --from=builder /usr/bin/agent /usr/bin/agent
 # skipcq: DOK-DL3002
 USER nonroot:nonroot
-ENTRYPOINT ["/usr/bin/agent"]
+ENTRYPOINT ["/usr/bin/agent"]
diff --git 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"]
+ENTRYPOINT ["/bin/bash"]
diff --git 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
+USER root:root
diff --git 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,