From e7838dd9eacb35aa8bb0e7ba5962f92186945d6e Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Fri, 15 Dec 2023 16:40:06 -0800 Subject: [PATCH] symlinks for additional jars needed by postgresql jdbc driver --- cadc-tomcat/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cadc-tomcat/Dockerfile b/cadc-tomcat/Dockerfile index 4c89ae1..d080e5b 100644 --- a/cadc-tomcat/Dockerfile +++ b/cadc-tomcat/Dockerfile @@ -15,12 +15,14 @@ RUN groupadd --gid 8675309 tomcat \ # install open source astronomy libraries needed by opencadc JNI libs # install minimal set of diagnostics tools: mainly for network connectivity RUN dnf install -y java-11-openjdk-headless.x86_64 tomcat.noarch ca-certificates sudo \ - && dnf install -y postgresql-jdbc wcslib erfa curl openssl nmap-ncat \ + && dnf install -y postgresql-jdbc \ + && dnf install -y wcslib erfa curl openssl nmap-ncat \ && rpm -e --nodeps java-17-openjdk-headless.x86_64 \ && dnf clean all # link jdbc driver(s) into tomcat lib -RUN ln -s /usr/share/java/postgresql-jdbc/postgresql.jar /usr/share/tomcat/lib/ +RUN cd /usr/share/tomcat/lib/ \ + && for jar in $(find /usr/share/java/postgresql-jdbc /usr/share/java/ongres-s* -type f); do ln -s $jar .; done # system settings and permissions COPY src/nofiles.conf /etc/security/limits.d/