Skip to content

Commit d9ae5bf

Browse files
committed
Bump to BCI:16.0 as base image
Signed-off-by: Derek Nola <derek.nola@suse.com>
1 parent d2596c4 commit d9ae5bf

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

images/nginx/rootfs/Dockerfile

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
# With BCI as base image, with the SLES 15 SP7 tag, which has a newer version of glibc
15-
FROM registry.suse.com/bci/bci-base:15.7 AS builder
15+
FROM registry.suse.com/bci/bci-base:16.0 AS builder
1616

17-
RUN zypper addrepo -p 105 http://download.opensuse.org/distribution/leap/15.6/repo/oss/ download.opensuse.org-oss && \
17+
RUN zypper addrepo -p 105 http://download.opensuse.org/distribution/leap/16.0/repo/oss/ download.opensuse.org-oss && \
1818
zypper --gpg-auto-import-keys refresh
1919

2020
COPY patches /patches
@@ -23,7 +23,7 @@ COPY --chmod=0755 build.sh /
2323
RUN /build.sh
2424

2525
# Use a multi-stage build
26-
FROM registry.suse.com/bci/bci-base:15.7
26+
FROM registry.suse.com/bci/bci-base:16.0
2727

2828
ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin
2929

@@ -39,33 +39,28 @@ COPY --from=builder /etc/nginx /etc/nginx
3939
RUN ln -s /usr/lib64/liblua5.3.so.5.3.0 /usr/local/lib/liblua-5.3.so
4040

4141
RUN zypper addrepo \
42-
-p 105 http://download.opensuse.org/distribution/leap/15.6/repo/oss/ download.opensuse.org-oss && \
42+
-p 105 http://download.opensuse.org/distribution/leap/16.0/repo/oss/ download.opensuse.org-oss && \
4343
zypper --gpg-auto-import-keys refresh
4444
RUN zypper install -y --allow-vendor-change \
4545
liblmdb-0_9_30 \
4646
libxml2-tools \
4747
libmaxminddb0 \
4848
libcap-progs \
4949
crypto-policies-scripts \
50-
libgrpc++1 \
50+
libgrpc++1_59 \
5151
libatomic1 \
5252
grpc-devel \
5353
wget \
5454
which \
5555
libyajl2 \
5656
openssl-3 \
5757
libpcre1 \
58-
libicu73_2 \
58+
libicu77 \
5959
liblua5_4-5 \
6060
libxslt-tools \
6161
procps \
6262
catatonit
6363

64-
# Remove zypper and other unnecessary packages
65-
RUN zypper -n clean -a && rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages && \
66-
rpm -e libsolv-tools-base zypper libzypp libaugeas0 libfa1 container-suseconnect \
67-
libyaml-cpp0_6 boost-license1_66_0 libboost_system1_66_0 libboost_thread1_66_0
68-
6964
RUN ldDirs=" \
7065
/usr/local/lib \
7166
/usr/local/lib64 \

images/nginx/rootfs/build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ get_src()
136136
# Dependencies from "ninja" and below are OTEL dependencies
137137
zypper install -y \
138138
bash \
139-
gcc12 \
139+
gcc \
140140
clang \
141141
make \
142142
automake \
@@ -160,13 +160,14 @@ zypper install -y \
160160
wget \
161161
libcurl-devel \
162162
protobuf-devel \
163-
git pkgconf gcc12-c++ flex bison doxygen libyajl-devel lmdb-devel libtool autoconf libxml2-2 libxml2-devel \
163+
git pkgconf gcc15-c++ flex bison doxygen libyajl-devel lmdb-devel libtool autoconf libxml2-2 libxml2-devel \
164164
python3 \
165165
libmaxminddb-devel \
166166
bc \
167167
unzip \
168168
dos2unix \
169-
libyaml-cpp0_6 \
169+
which \
170+
libyaml-cpp0_8 \
170171
ninja \
171172
gtest \
172173
git \
@@ -290,8 +291,8 @@ ln -s "$LUAJIT_INC" /usr/local/include/lua
290291

291292
cd "$BUILD_PATH/opentelemetry-cpp"
292293
export CXXFLAGS="-DBENCHMARK_HAS_NO_INLINE_ASSEMBLY"
293-
export CC="gcc-12"
294-
export CXX="g++-12"
294+
export CC="gcc"
295+
export CXX="g++-15"
295296
cmake -B build -G Ninja -Wno-dev \
296297
-DOTELCPP_PROTO_PATH="${BUILD_PATH}/opentelemetry-proto/" \
297298
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -301,6 +302,7 @@ cmake -B build -G Ninja -Wno-dev \
301302
-DCMAKE_BUILD_TYPE=None \
302303
-DWITH_ABSEIL=ON \
303304
-DWITH_STL=ON \
305+
-DCMAKE_CXX_STANDARD=23 \
304306
-DWITH_EXAMPLES=OFF \
305307
-DWITH_ZPAGES=OFF \
306308
-DWITH_OTLP_GRPC=ON \

0 commit comments

Comments
 (0)