Skip to content

Commit 07b9899

Browse files
scotthartscotthart
committed
update docker files to remove WITH_ABSEIL
1 parent 777cec3 commit 07b9899

16 files changed

+6
-278
lines changed

‎ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
7979
-DBUILD_SHARED_LIBS=yes \
8080
-DWITH_EXAMPLES=OFF \
8181
-DWITH_STL=CXX17 \
82-
-DWITH_ABSEIL=ON \
8382
-DBUILD_TESTING=OFF \
8483
-DOPENTELEMETRY_INSTALL=ON \
8584
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
9696
-DBUILD_SHARED_LIBS=yes \
9797
-DWITH_EXAMPLES=OFF \
9898
-DWITH_STL=CXX17 \
99-
-DWITH_ABSEIL=ON \
10099
-DBUILD_TESTING=OFF \
101100
-DOPENTELEMETRY_INSTALL=ON \
102101
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
123123

124124
# #### gRPC
125125

126-
# Finally, we build gRPC from source:
127-
128126
# ```bash
129127
WORKDIR /var/tmp/build/grpc
130128
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
@@ -163,7 +161,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
163161
-DBUILD_SHARED_LIBS=yes \
164162
-DWITH_EXAMPLES=OFF \
165163
-DWITH_STL=CXX17 \
166-
-DWITH_ABSEIL=ON \
167164
-DBUILD_TESTING=OFF \
168165
-DOPENTELEMETRY_INSTALL=ON \
169166
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
8787
-DBUILD_SHARED_LIBS=yes \
8888
-DWITH_EXAMPLES=OFF \
8989
-DWITH_STL=CXX17 \
90-
-DWITH_ABSEIL=ON \
9190
-DBUILD_TESTING=OFF \
9291
-DOPENTELEMETRY_INSTALL=ON \
9392
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile‎

Lines changed: 2 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,14 @@ RUN zypper refresh && \
3030
gcc8 gcc8-c++ git gzip libtool make patch tar wget
3131
# ```
3232

33-
RUN zypper refresh && \
34-
zypper install --allow-downgrade -y gdb
35-
36-
#RUN zypper refresh && \
37-
# zypper install --allow-downgrade -y krb5-debuginfo-1.20.1-150600.11.14.1.x86_64 \
38-
# libabsl2401_0_0-debuginfo-20240116.3-150600.19.3.15.x86_64 \
39-
# libbrotlidec1-debuginfo-1.0.7-150200.3.5.1.x86_64 \
40-
# libcares2-debuginfo-1.19.1-150000.3.26.1.x86_64 \
41-
# libcom_err2-debuginfo-1.47.0-150600.4.6.2.x86_64 \
42-
# libcrc32c1-debuginfo-1.1.2-150400.9.3.1.x86_64 \
43-
# libcurl4-debuginfo-8.14.1-150600.4.31.1.x86_64 \
44-
# libgcc_s1-debuginfo-15.2.0+git10201-150000.1.3.3.x86_64 \
45-
# libgrpc++1_60-debuginfo-1.60.0-150600.15.3.1.x86_64 \
46-
# libgrpc37-debuginfo-1.60.0-150600.15.3.1.x86_64 \
47-
# libidn2-0-debuginfo-2.2.0-3.6.1.x86_64 \
48-
# libjitterentropy3-debuginfo-3.4.1-150000.1.12.1.x86_64 \
49-
# libkeyutils1-debuginfo-1.6.3-5.6.1.x86_64 \
50-
# libldap-2_4-2-debuginfo-2.4.46-150600.23.21.x86_64 \
51-
# libnghttp2-14-debuginfo-1.40.0-150600.23.2.x86_64 \
52-
# libopenssl3-debuginfo-3.1.4-150600.5.39.1.x86_64 libpcre2-8-0-debuginfo-10.42-150600.1.26.x86_64 libprotobuf25_1_0-debuginfo-25.1-150600.16.13.1.x86_64 libpsl5-debuginfo-0.20.1-150000.3.3.1.x86_64 libre2-11-debuginfo-20240201-150600.14.2.x86_64 libsasl2-3-debuginfo-2.1.28-150600.7.14.1.x86_64 libselinux1-debuginfo-3.5-150600.3.3.1.x86_64 libstdc++6-debuginfo-15.2.0+git10201-150000.1.3.3.x86_64 libunistring2-debuginfo-0.9.10-1.1.x86_64 libupb37-debuginfo-1.60.0-150600.15.3.1.x86_64 libz1-debuginfo-1.2.13-150500.4.3.1.x86_64 libzstd1-debuginfo-1.5.5-150600.1.3.x86_64
53-
5433
# Install some of the dependencies for `google-cloud-cpp`.
5534

5635
# ```bash
57-
#RUN zypper refresh && \
58-
# zypper install --allow-downgrade -y c-ares-devel \
59-
# libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel
60-
# ```
61-
6236
RUN zypper refresh && \
6337
zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \
6438
libcurl-devel libopenssl-devel libcrc32c-devel nlohmann_json-devel \
6539
grpc-devel libprotobuf-devel
40+
# ```
6641

6742
# The following steps will install libraries and tools in `/usr/local`. openSUSE
6843
# does not search for shared libraries in these directories by default. There
@@ -77,104 +52,12 @@ ENV PATH=/usr/local/bin:${PATH}
7752

7853
# Use the following environment variables to configure the compiler used by
7954
# CMake.
80-
81-
#ENV CC=gcc-8
82-
#ENV CXX=g++-8
83-
84-
# #### Abseil
85-
86-
# ```bash
87-
#WORKDIR /var/tmp/build/abseil-cpp
88-
#RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz | \
89-
# tar -xzf - --strip-components=1 && \
90-
# cmake \
91-
# -DCMAKE_BUILD_TYPE=Release \
92-
# -DCMAKE_CXX_STANDARD=17 \
93-
# -DABSL_BUILD_TESTING=OFF \
94-
# -DABSL_PROPAGATE_CXX_STD=ON \
95-
# -DBUILD_SHARED_LIBS=yes \
96-
# -S . -B cmake-out && \
97-
# cmake --build cmake-out -- -j ${NCPU:-4} && \
98-
# cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
99-
# ldconfig
100-
# ```
101-
102-
# #### Protobuf
103-
104-
# Unless you are only using the Google Cloud Storage library the project
105-
# needs Protobuf and gRPC. Unfortunately the version of Protobuf that ships
106-
# with Debian 11 is not recent enough to support the protos published by
107-
# Google Cloud. We need to build from source:
108-
109-
# ```bash
110-
#WORKDIR /var/tmp/build/protobuf
111-
#RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz | \
112-
# tar -xzf - --strip-components=1 && \
113-
# cmake \
114-
# -DCMAKE_BUILD_TYPE=Release \
115-
# -DCMAKE_CXX_STANDARD=17 \
116-
# -DBUILD_SHARED_LIBS=yes \
117-
# -Dprotobuf_BUILD_TESTS=OFF \
118-
# -Dprotobuf_ABSL_PROVIDER=package \
119-
# -S . -B cmake-out && \
120-
# cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
121-
# ldconfig
122-
# ```
123-
124-
# #### RE2
125-
126-
# The version of RE2 included with this distro hard-codes C++11 in its
127-
# pkg-config file. You can skip this build and use the system's package if
128-
# you are not planning to use pkg-config.
129-
130-
# ```bash
131-
#WORKDIR /var/tmp/build/re2
132-
#RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
133-
# tar -xzf - --strip-components=1 && \
134-
# cmake -DCMAKE_BUILD_TYPE=Release \
135-
# -DCMAKE_CXX_STANDARD=17 \
136-
# -DBUILD_SHARED_LIBS=ON \
137-
# -DRE2_BUILD_TESTING=OFF \
138-
# -S . -B cmake-out && \
139-
# cmake --build cmake-out -- -j ${NCPU:-4} && \
140-
# cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
141-
# ldconfig
142-
# ```
143-
144-
# #### gRPC
145-
146-
# Finally, we build gRPC from source:
147-
148-
# ```bash
149-
#WORKDIR /var/tmp/build/grpc
150-
#RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.74.1.tar.gz | \
151-
# tar -xzf - --strip-components=1 && \
152-
# cmake \
153-
# -DCMAKE_BUILD_TYPE=Release \
154-
# -DCMAKE_CXX_STANDARD=17 \
155-
# -DBUILD_SHARED_LIBS=yes \
156-
# -DgRPC_INSTALL=ON \
157-
# -DgRPC_BUILD_TESTS=OFF \
158-
# -DgRPC_ABSL_PROVIDER=package \
159-
# -DgRPC_CARES_PROVIDER=package \
160-
# -DgRPC_PROTOBUF_PROVIDER=package \
161-
# -DgRPC_RE2_PROVIDER=package \
162-
# -DgRPC_SSL_PROVIDER=package \
163-
# -DgRPC_ZLIB_PROVIDER=package \
164-
# -S . -B cmake-out && \
165-
# cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
166-
# ldconfig
167-
# ```
168-
16955
ENV CC=gcc-8
17056
ENV CXX=g++-8
17157

17258
# #### opentelemetry-cpp
17359

174-
# The project has an **optional** dependency on the OpenTelemetry library.
175-
# We recommend installing this library because:
176-
# - the dependency will become required in the google-cloud-cpp v3.x series.
177-
# - it is needed to produce distributed traces of the library.
60+
# The project has a dependency on the OpenTelemetry library.
17861

17962
# ```bash
18063
WORKDIR /var/tmp/build/opentelemetry-cpp

‎ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
209209
-DBUILD_SHARED_LIBS=yes \
210210
-DWITH_EXAMPLES=OFF \
211211
-DWITH_STL=CXX17 \
212-
-DWITH_ABSEIL=ON \
213212
-DBUILD_TESTING=OFF \
214213
-DOPENTELEMETRY_INSTALL=ON \
215214
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-24.04.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
100100
-DBUILD_SHARED_LIBS=yes \
101101
-DWITH_EXAMPLES=OFF \
102102
-DWITH_STL=CXX17 \
103-
-DWITH_ABSEIL=ON \
104103
-DBUILD_TESTING=OFF \
105104
-DOPENTELEMETRY_INSTALL=ON \
106105
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
176176
-DBUILD_SHARED_LIBS=yes \
177177
-DWITH_EXAMPLES=OFF \
178178
-DWITH_STL=CXX17 \
179-
-DWITH_ABSEIL=ON \
180179
-DBUILD_TESTING=OFF \
181180
-DOPENTELEMETRY_INSTALL=ON \
182181
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
157157
-DBUILD_SHARED_LIBS=yes \
158158
-DWITH_EXAMPLES=OFF \
159159
-DWITH_STL=CXX17 \
160-
-DWITH_ABSEIL=ON \
161160
-DBUILD_TESTING=OFF \
162161
-DOPENTELEMETRY_INSTALL=ON \
163162
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

‎ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
150150
-DBUILD_SHARED_LIBS=ON \
151151
-DWITH_EXAMPLES=OFF \
152152
-DWITH_STL=CXX17 \
153-
-DWITH_ABSEIL=ON \
154153
-DBUILD_TESTING=OFF \
155154
-DOPENTELEMETRY_INSTALL=ON \
156155
-DOPENTELEMETRY_ABI_VERSION_NO=2 \

0 commit comments

Comments
 (0)