Merge "DG bugfix"
Former-commit-id: c63666f4fe294f2dfcf5555725f7202948e46810
diff --git a/admportal/views/user/list.ejs b/admportal/views/user/list.ejs
index 4a4e909..947a811 100644
--- a/admportal/views/user/list.ejs
+++ b/admportal/views/user/list.ejs
@@ -178,7 +178,7 @@
document.getElementById('uf_confirm_password').value = password;
if ( privilege == "A" ){
document.getElementById('uf_privilege').value = 'admin';
- }else if (priv == "R"){
+ }else if (privilege == "R"){
document.getElementById('uf_privilege').value = 'readonly';
}else{
document.getElementById('uf_privilege').value = 'admin';
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 7f7c0de..df39210 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -13,6 +13,8 @@
ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
+USER root
+
# imstall ssl and java certificates
COPY AAF_RootCA.cer $SSL_CERTS_DIR
@@ -35,6 +37,8 @@
RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN chown -R odl /opt
+USER odl
ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh
EXPOSE 8181
diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 0ff773d..8008dfd 100644
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
# Base alpine with added packages needed for open ecomp
FROM onap/ccsdk-alpine-image:${ccsdk.docker.version}
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties