From 54f533e96504621da21b8d1b3ec16d942f4c676d Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Tue, 19 Aug 2025 12:52:23 -0700 Subject: [PATCH 1/2] Dockerfile updates to 23 Signed-off-by: Anders Swanson --- Dockerfile | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0cc542a8..289d26d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,28 +35,14 @@ ENV DEBIAN_FRONTEND=noninteractive ARG GOARCH ENV GOARCH=${GOARCH:-amd64} -# note: the 23ai arm drivers are not in yum yet, when they are can switch this to just use yum and not need -# to wget the driver for arm. also note that the permalink for otn download of drivers does not have version -# in it, and does not appear to be a link vith version in it, so that link is very brittle and could break build - -# second note: moved back to 21c drivers due to adb-s non-root connection issue. for 23ai, change rpm to -# oracle-instantclient-release-23ai-el8 and paths below s/21/23/ -RUN if [ "$GOARCH" = "amd64" ]; then \ - microdnf update && \ - microdnf install -y oracle-instantclient-release-el8 && \ - microdnf install -y oracle-instantclient-basic && \ - microdnf install glibc-2.28-251.0.2.el8_10.4 \ - ; else \ - microdnf update && \ - microdnf install wget libaio && \ - wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basic-linux-arm64.rpm && \ - rpm -ivh instantclient-basic-linux-arm64.rpm && \ - ln -s /usr/lib/oracle/19.24 /usr/lib/oracle/21 && \ - microdnf install glibc-2.28-251.0.2.el8_10.4 \ - ; fi - -ENV LD_LIBRARY_PATH=/usr/lib/oracle/21/client64/lib:usr/lib/oracle/19.24/client64/lib -ENV PATH=$PATH:/usr/lib/oracle/21/client64/bin:usr/lib/oracle/19.24/client64/bin +RUN microdnf update && \ + microdnf install -y oracle-instantclient-release-23ai-el8-1.0-4.el8 && \ + microdnf install -y oracle-instantclient-basic-23.9.0.25.07-1.el8 && \ + microdnf install -y glibc-2.28-251.0.3.el8_10.25 && \ + ln -s /usr/lib/oracle/19.24 /usr/lib/oracle/23 + +ENV LD_LIBRARY_PATH=/usr/lib/oracle/23/client64/lib:usr/lib/oracle/19.24/client64/lib +ENV PATH=$PATH:/usr/lib/oracle/23/client64/bin:usr/lib/oracle/19.24/client64/bin COPY --from=build /go/src/oracledb_exporter/oracle-db-appdev-monitoring /oracledb_exporter ADD ./default-metrics.toml /default-metrics.toml From b91b2cb9220dbe1dcbf2a1da708409799bfa5aa8 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Wed, 20 Aug 2025 07:38:33 -0700 Subject: [PATCH 2/2] Dockerfile fixes Signed-off-by: Anders Swanson --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 289d26d7..c9a2965d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,11 +38,10 @@ ENV GOARCH=${GOARCH:-amd64} RUN microdnf update && \ microdnf install -y oracle-instantclient-release-23ai-el8-1.0-4.el8 && \ microdnf install -y oracle-instantclient-basic-23.9.0.25.07-1.el8 && \ - microdnf install -y glibc-2.28-251.0.3.el8_10.25 && \ - ln -s /usr/lib/oracle/19.24 /usr/lib/oracle/23 + microdnf install -y glibc-2.28-251.0.3.el8_10.25 -ENV LD_LIBRARY_PATH=/usr/lib/oracle/23/client64/lib:usr/lib/oracle/19.24/client64/lib -ENV PATH=$PATH:/usr/lib/oracle/23/client64/bin:usr/lib/oracle/19.24/client64/bin +ENV LD_LIBRARY_PATH=/usr/lib/oracle/23/client64/lib +ENV PATH=$PATH:/usr/lib/oracle/23/client64/bin COPY --from=build /go/src/oracledb_exporter/oracle-db-appdev-monitoring /oracledb_exporter ADD ./default-metrics.toml /default-metrics.toml