From aee34f9d902347902da1e6c12549e7591e95cc0b Mon Sep 17 00:00:00 2001 From: Kiichiro YUKAWA Date: Fri, 31 Jan 2025 12:39:10 +0900 Subject: [PATCH] Fix docker build error (benchmark-job, loadtest) (#2819) * :green_heart: Add libcurl4-openssl-dev Signed-off-by: vankichi * :recycle: Remove apt get libhd5-dev Signed-off-by: vankichi --------- Signed-off-by: vankichi --- Makefile.d/tools.mk | 3 ++- dockers/ci/base/Dockerfile | 1 - dockers/dev/Dockerfile | 1 - dockers/example/client/Dockerfile | 1 - dockers/tools/benchmark/job/Dockerfile | 1 - dockers/tools/cli/loadtest/Dockerfile | 1 - hack/docker/gen/main.go | 7 +++---- 7 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index 75b4cf79d8..f7843af643 100644 --- 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 index ebaf45a89f..12572f742a 100644 --- 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 index 290b99c402..f176b94d28 100644 --- 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 index 10832c6b97..5ec5cdc9a8 100644 --- 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 index 2a8de4148f..fc778ef054 100644 --- 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 index 9fb68ef125..9ac5f7dd14 100644 --- 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 index a27acc9a8f..49cd257124 100644 --- 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", },