X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2FDockerfile.cass;h=0db5fa57eaaf93762325fc9e45a187b1e9b06c28;hb=ab6dc4c77a4dd29ae4e31144abb568dd64bc015b;hp=f842a962773d2b35cba7c551691f2dade2aea4f0;hpb=f54a4aad8cdff00f2bbac984b1e98fb1add038be;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass
index f842a962..0db5fa57 100644
--- a/auth/auth-cass/docker/Dockerfile.cass
+++ b/auth/auth-cass/docker/Dockerfile.cass
@@ -17,9 +17,8 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-# public, multi-platform base image
-FROM nexus3.onap.org:10001/cassandra:3.11
-# FROM cassandra:3.11
+# Use dbuild.sh input parameter to set registry
+FROM ${REGISTRY}/cassandra:3.11
 MAINTAINER AAF Team, AT&T 2018
 ENV VERSION=${AAF_VERSION}
 
@@ -29,12 +28,12 @@ LABEL version=${AAF_VERSION}
 COPY cass_init/*.cql /opt/app/aaf/cass_init/
 COPY cass_init/*.sh /opt/app/aaf/cass_init/
 COPY cass_init/*.props /opt/app/aaf/cass_init/
-COPY aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf/cass_init/
+COPY aaf-auth-batch-*-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"]