Skip to content

Commit 63c5c64

Browse files
scotthartscotthart
committed
update dockerfiles
1 parent ba4e511 commit 63c5c64

18 files changed

Lines changed: 55 additions & 29 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
7676
-DWITH_STL=CXX17 \
7777
-DBUILD_TESTING=OFF \
7878
-DOPENTELEMETRY_INSTALL=ON \
79-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
79+
-DWITH_ABI_VERSION_1=OFF \
80+
-DWITH_ABI_VERSION_2=ON \
8081
-S . -B cmake-out && \
8182
cmake --build cmake-out --target install -- -j ${NCPU:-4}
8283
# ```

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
126126
-DWITH_STL=CXX17 \
127127
-DBUILD_TESTING=OFF \
128128
-DOPENTELEMETRY_INSTALL=ON \
129-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
129+
-DWITH_ABI_VERSION_1=OFF \
130+
-DWITH_ABI_VERSION_2=ON \
130131
-S . -B cmake-out && \
131132
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
132133
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
159159
-DWITH_STL=CXX17 \
160160
-DBUILD_TESTING=OFF \
161161
-DOPENTELEMETRY_INSTALL=ON \
162-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
162+
-DWITH_ABI_VERSION_1=OFF \
163+
-DWITH_ABI_VERSION_2=ON \
163164
-S . -B cmake-out && \
164165
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
165166
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
115115
-DWITH_STL=CXX17 \
116116
-DBUILD_TESTING=OFF \
117117
-DOPENTELEMETRY_INSTALL=ON \
118-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
118+
-DWITH_ABI_VERSION_1=OFF \
119+
-DWITH_ABI_VERSION_2=ON \
119120
-S . -B cmake-out && \
120121
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
121122
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
103103
-DWITH_STL=CXX17 \
104104
-DBUILD_TESTING=OFF \
105105
-DOPENTELEMETRY_INSTALL=ON \
106-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
106+
-DWITH_ABI_VERSION_1=OFF \
107+
-DWITH_ABI_VERSION_2=ON \
107108
-S . -B cmake-out && \
108109
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
109110
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
213213
-DWITH_STL=CXX17 \
214214
-DBUILD_TESTING=OFF \
215215
-DOPENTELEMETRY_INSTALL=ON \
216-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
216+
-DWITH_ABI_VERSION_1=OFF \
217+
-DWITH_ABI_VERSION_2=ON \
217218
-S . -B cmake-out && \
218219
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
219220
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
126126
-DWITH_STL=CXX17 \
127127
-DBUILD_TESTING=OFF \
128128
-DOPENTELEMETRY_INSTALL=ON \
129-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
129+
-DWITH_ABI_VERSION_1=OFF \
130+
-DWITH_ABI_VERSION_2=ON \
130131
-S . -B cmake-out && \
131132
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
132133
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
150150
-DWITH_STL=CXX17 \
151151
-DBUILD_TESTING=OFF \
152152
-DOPENTELEMETRY_INSTALL=ON \
153-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
153+
-DWITH_ABI_VERSION_1=OFF \
154+
-DWITH_ABI_VERSION_2=ON \
154155
-S . -B cmake-out && \
155156
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
156157
ldconfig

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
170170
-DWITH_STL=CXX17 \
171171
-DBUILD_TESTING=OFF \
172172
-DOPENTELEMETRY_INSTALL=ON \
173-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
173+
-DWITH_ABI_VERSION_1=OFF \
174+
-DWITH_ABI_VERSION_2=ON \
174175
-S . -B cmake-out -GNinja && \
175176
cmake --build cmake-out --target install && \
176177
ldconfig && cd /var/tmp && rm -fr build

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
170170
-DWITH_STL=CXX17 \
171171
-DBUILD_TESTING=OFF \
172172
-DOPENTELEMETRY_INSTALL=ON \
173-
-DOPENTELEMETRY_ABI_VERSION_NO=2 \
173+
-DWITH_ABI_VERSION_1=OFF \
174+
-DWITH_ABI_VERSION_2=ON \
174175
-S . -B cmake-out -GNinja && \
175176
cmake --build cmake-out --target install && \
176177
ldconfig && cd /var/tmp && rm -fr build

0 commit comments

Comments
 (0)