diff --git a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile index 453634ea87ecd..2edb62b27c75a 100644 --- a/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile +++ b/ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile @@ -35,7 +35,8 @@ RUN zypper refresh && \ # ```bash RUN zypper refresh && \ zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \ - libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel + libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel \ + grpc-devel libprotobuf-devel # ``` # The following steps will install libraries and tools in `/usr/local`. openSUSE @@ -49,68 +50,6 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig ENV PATH=/usr/local/bin:${PATH} # ``` -# #### RE2 - -# ```bash -WORKDIR /var/tmp/build/re2 -RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DRE2_BUILD_TESTING=OFF \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ - cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ - ldconfig -# ``` - -# #### Protobuf - -# We need to install a version of Protobuf that is recent enough to support the -# Google Cloud Platform proto files: - -# ```bash -WORKDIR /var/tmp/build/protobuf -RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v27.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ - cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ - ldconfig -# ``` - -# #### gRPC - -# We also need a version of gRPC that is recent enough to support the Google -# Cloud Platform proto files. We manually install it using: - -# ```bash -WORKDIR /var/tmp/build/grpc -RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.64.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ - cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ - ldconfig -# ``` - # #### opentelemetry-cpp # The project has an **optional** dependency on the OpenTelemetry library. diff --git a/doc/packaging.md b/doc/packaging.md index 3ab413ea23f0a..b2d6ade19416e 100644 --- a/doc/packaging.md +++ b/doc/packaging.md @@ -363,7 +363,8 @@ Install some of the dependencies for `google-cloud-cpp`. ```bash sudo zypper refresh && \ sudo zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \ - libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel + libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel \ + grpc-devel libprotobuf-devel ``` The following steps will install libraries and tools in `/usr/local`. openSUSE @@ -377,68 +378,6 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig export PATH=/usr/local/bin:${PATH} ``` -#### RE2 - -```bash -mkdir -p $HOME/Downloads/re2 && cd $HOME/Downloads/re2 -curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=ON \ - -DRE2_BUILD_TESTING=OFF \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ -sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ -sudo ldconfig -``` - -#### Protobuf - -We need to install a version of Protobuf that is recent enough to support the -Google Cloud Platform proto files: - -```bash -mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf -curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v27.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ -sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ -sudo ldconfig -``` - -#### gRPC - -We also need a version of gRPC that is recent enough to support the Google Cloud -Platform proto files. We manually install it using: - -```bash -mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc -curl -fsSL https://github.com/grpc/grpc/archive/v1.64.2.tar.gz | \ - tar -xzf - --strip-components=1 && \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=yes \ - -DgRPC_INSTALL=ON \ - -DgRPC_BUILD_TESTS=OFF \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -S . -B cmake-out && \ - cmake --build cmake-out -- -j ${NCPU:-4} && \ -sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \ -sudo ldconfig -``` - #### opentelemetry-cpp The project has an **optional** dependency on the OpenTelemetry library. We