Slight mod for Cass Dockerfile

Issue-ID: AAF-917
Change-Id: I5b086aa126c602513474569a56adbbc9360ee877
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass
index 0406411..c25135e 100644 (file)
--- a/auth/auth-cass/docker/Dockerfile.cass
+++ b/auth/auth-cass/docker/Dockerfile.cass
@@ -31,9 +31,9 @@ COPY cass_init/*.props /opt/app/aaf/cass_init/
 COPY aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf/cass_init/
 COPY cass_data/*.dat /opt/app/aaf/cass_init/dats/
 
-RUN mkdir -p /opt/app/aaf/status && chmod 777 /opt/app/aaf/status
-RUN addgroup ${USER} && adduser --no-create-home --ingroup ${USER} --disabled-password --gecos "" --shell /bin/bash ${USER}
-RUN chown -R ${USER}:${USER} /opt/app/aaf/cass_init
+RUN mkdir -p /opt/app/aaf/status && chmod 777 /opt/app/aaf/status && \
+    addgroup ${USER} && adduser --no-create-home --ingroup ${USER} --disabled-password --gecos "" --shell /bin/bash ${USER} && \
+    chown -R ${USER}:${USER} /opt/app/aaf/cass_init
 
 
 ENTRYPOINT ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh"]

diff --git a/auth/auth-cass/docker/dcqlsh.sh b/auth/auth-cass/docker/dcqlsh.sh
index 92944f0..2518eb9 100644 (file)
--- a/auth/auth-cass/docker/dcqlsh.sh
+++ b/auth/auth-cass/docker/dcqlsh.sh
@@ -22,5 +22,5 @@
 if [ -e ../../docker/d.props ]; then
   . ../../docker/d.props
 fi
-${DOCKER:=docker} exec -it aaf_cass /usr/bin/cqlsh -k authz
+${DOCKER:=docker} exec -it aaf-cass /usr/bin/cqlsh -k authz
 

diff --git a/auth/auth-gui/theme/onap/images/logo_onap.png b/auth/auth-gui/theme/onap/images/logo_onap.png
new file mode 100644 (file)
index 0000000..458e320
Binary files /dev/null and b/auth/auth-gui/theme/onap/images/logo_onap.png differ