From 96bf6a2771dfe992fb27bd6361d191d83b6ff605 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 24 Mar 2020 17:07:27 -0500 Subject: AAF Services non root, all platforms adjust Agent for JDK 11 Included redoing Config and Agent Init Containers refit for "hello" (sample) Issue-ID: AAF-1102 Signed-off-by: Instrumental Change-Id: Ia957b1ccce34d164580ccb0a6d02d7b800e4887e --- auth/auth-cass/docker/Dockerfile.cass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'auth/auth-cass/docker') diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass index 5d9c3db9..2d60da2e 100644 --- a/auth/auth-cass/docker/Dockerfile.cass +++ b/auth/auth-cass/docker/Dockerfile.cass @@ -34,11 +34,12 @@ COPY sample.identities.dat /opt/app/aaf/cass_init/data/identites.dat RUN mkdir -p /opt/app/aaf/status &&\ chmod 777 /opt/app/aaf/status && \ - addgroup ${DUSER} && adduser --ingroup cassandra --disabled-password --gecos "" --shell /bin/bash ${DUSER} && \ - chown -R ${DUSER}:cassandra /opt/app/aaf/cass_init &&\ - chown -R ${DUSER}:cassandra /etc/cassandra &&\ - mkdir -p /var/lib/cassandra/data && chown -R ${DUSER}:cassandra /var/lib/cassandra &&\ - chown -R ${DUSER}:cassandra /var/log/cassandra &&\ + if [ ! -z "${DUSER}" ]; then \ + addgroup --gid 1000 ${DUSER}; \ + adduser --ingroup ${DUSER} --disabled-password --gecos "" --shell /bin/bash -u 1000 ${DUSER} ; \ + mkdir -p /var/lib/cassandra/data /var/log/cassandra ; \ + chown -R 1000:1000 /opt/app/aaf /etc/cassandra /var/log/cassandra /var/lib/cassandra ; \ + fi && \ ln -s /opt/app/aaf/cass_init/cmd.sh /aaf_cmd && chmod a+x /aaf_cmd USER ${DUSER} -- cgit 1.2.3-korg