summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-03-16 23:33:42 -0500
committerJorge Hernandez <jorge.hernandez-herrero@att.com>2019-03-16 23:33:42 -0500
commite85a8ef21ec42dbe6f006f532ec3385e0d8c1a4a (patch)
tree44d85879b5302eca9cc20bcbd5e4461810221295
parent8c13d49161c3b936ba600643c4862c005fafeb82 (diff)
Manually add NSS libraries to images.
Alpine OpenJDK was updated 2 days ago (3/14), this upgrade seems to break java applications that depend on libnss*.so OS libraries, which seem are no longer installed with the jdk. Before: openjdk version "1.8.0_191" OpenJDK Runtime Environment (IcedTea 3.10.0) (Alpine 8.191.12-r0) OpenJDK 64-Bit Server VM (build 25.191-b12, mixed mode ls /usr/lib/libnss* /usr/lib/libnss3.so /usr/lib/libnssckbi.so.41 /usr/lib/libnssdbm3.so.41 /usr/lib/libnss3.so.41 /usr/lib/libnssdbm3.chk /usr/lib/libnssutil3.so /usr/lib/libnssckbi.so /usr/lib/libnssdbm3.so /usr/lib/libnssutil3.so.41 Now: openjdk version "1.8.0_201" OpenJDK Runtime Environment (IcedTea 3.11.0) (Alpine 8.201.08-r0) OpenJDK 64-Bit Server VM (build 25.201-b08, mixed mode) > ls /usr/lib/libnss*" ls: cannot access '/usr/lib/libnss*': No such file or directory Change-Id: I371d1b3426ded294dba16d4217f6c9ce5a5acf04 Issue-ID: POLICY-1604 Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
-rw-r--r--packages/base/src/files/etc/profile.d/env.sh4
-rw-r--r--packages/docker/src/main/docker/Dockerfile2
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/base/src/files/etc/profile.d/env.sh b/packages/base/src/files/etc/profile.d/env.sh
index 5a58940f..00f61df4 100644
--- a/packages/base/src/files/etc/profile.d/env.sh
+++ b/packages/base/src/files/etc/profile.d/env.sh
@@ -35,11 +35,13 @@ if [[ -z "${POLICY_HOME}" ]]; then
fi
fi
+confs=$(ls "${POLICY_HOME}"/etc/profile.d/*.conf 2> /dev/null)
+c=
+
set -a
POLICY_HOME=${POLICY_HOME:=/opt/app/policy}
-confs=$(ls "${POLICY_HOME}"/etc/profile.d/*.conf 2> /dev/null)
for c in ${confs} ; do
source ${c}
done
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile
index aaae2826..c6397b62 100644
--- a/packages/docker/src/main/docker/Dockerfile
+++ b/packages/docker/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@ RUN apk update && \
bash bash-completion procps \
coreutils less grep findutils \
zip unzip file \
- openssl openssh \
+ nss openssl openssh \
python py-pip openjdk8 maven \
curl wget httpie jq