Fix docker build error (benchmark-job, loadtest) (#2819)

* 💚 Add libcurl4-openssl-dev Signed-off-by: vankichi <[email protected]> * ♻️ Remove apt get libhd5-dev Signed-off-by: vankichi <[email protected]> --------- Signed-off-by: vankichi <[email protected]>
vdaas · Jan 31, 2025 · aee34f9 · aee34f9
1 parent e3865d4
commit aee34f9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk
@@ -259,7 +259,8 @@ $(LIB_PATH)/libhdf5.a: $(LIB_PATH) \
 	&& make -j$(CORES) \
 	&& make install \
 	&& cd $(ROOTDIR) \
-	&& rm -rf $(TEMP_DIR)/hdf5.tar.gz $(TEMP_DIR)/hdf5
+	&& rm -rf $(TEMP_DIR)/hdf5.tar.gz $(TEMP_DIR)/hdf5 \
+	&& ldconfig
 
 .PHONY: yq/install
 ## install yq

diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile
@@ -88,7 +88,6 @@ RUN --mount=type=bind,target=.,rw \
     graphviz \
     jq \
     libaec-dev \
-    libhdf5-dev \
     sed \
     zip \
     && ldconfig \

diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
@@ -88,7 +88,6 @@ RUN --mount=type=bind,target=.,rw \
     graphviz \
     jq \
     libaec-dev \
-    libhdf5-dev \
     sed \
     zip \
     && ldconfig \

diff --git a/dockers/example/client/Dockerfile b/dockers/example/client/Dockerfile
@@ -71,7 +71,6 @@ RUN --mount=type=bind,target=.,rw \
     gcc \
     libssl-dev \
     unzip \
-    libhdf5-dev \
     libaec-dev \
     && ldconfig \
     && echo "${LANG} UTF-8" > /etc/locale.gen \

diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile
@@ -71,7 +71,6 @@ RUN --mount=type=bind,target=.,rw \
     gcc \
     libssl-dev \
     unzip \
-    libhdf5-dev \
     libaec-dev \
     && ldconfig \
     && echo "${LANG} UTF-8" > /etc/locale.gen \

diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile
@@ -71,7 +71,6 @@ RUN --mount=type=bind,target=.,rw \
     gcc \
     libssl-dev \
     unzip \
-    libhdf5-dev \
     libaec-dev \
     && ldconfig \
     && echo "${LANG} UTF-8" > /etc/locale.gen \

diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go
@@ -483,7 +483,6 @@ var (
 		"graphviz",
 		"jq",
 		"libaec-dev",
-		"libhdf5-dev",
 		"sed",
 		"zip",
 	}
@@ -746,7 +745,7 @@ func main() {
 		"vald-benchmark-job": {
 			AppName:       "job",
 			PackageDir:    "tools/benchmark/job",
-			ExtraPackages: append(clangBuildDeps, "libhdf5-dev", "libaec-dev"),
+			ExtraPackages: append(clangBuildDeps, "libaec-dev"),
 			Preprocess: []string{
 				"make hdf5/install",
 			},
@@ -797,7 +796,7 @@ func main() {
 		"vald-loadtest": {
 			AppName:       "loadtest",
 			PackageDir:    "tools/cli/loadtest",
-			ExtraPackages: append(clangBuildDeps, "libhdf5-dev", "libaec-dev"),
+			ExtraPackages: append(clangBuildDeps, "libaec-dev"),
 			Preprocess: []string{
 				"make hdf5/install",
 			},
@@ -836,7 +835,7 @@ func main() {
 		"vald-example-client": {
 			AppName:       "client",
 			PackageDir:    "example/client",
-			ExtraPackages: append(clangBuildDeps, "libhdf5-dev", "libaec-dev"),
+			ExtraPackages: append(clangBuildDeps, "libaec-dev"),
 			Preprocess: []string{
 				"make hdf5/install",
 			},