update Container 2.1.18b

[aaf/authz.git] / auth / auth-cass / docker / Dockerfile.cass

diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass
index aa6a9ef..0db5fa5 100644 (file)
--- a/auth/auth-cass/docker/Dockerfile.cass
+++ b/auth/auth-cass/docker/Dockerfile.cass
@@ -17,7 +17,8 @@
 #  limitations under the License.
 #  ============LICENSE_END====================================================
 #
-FROM nexus3.onap.org:10001/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}
 
@@ -27,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"]