summaryrefslogtreecommitdiffstats
path: root/auth/auth-cass/docker
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-08-01 14:16:33 -0500
committerInstrumental <jonathan.gathman@att.com>2019-08-01 14:16:43 -0500
commitaca17303a5c5df832b4c73acf8d818cd2c85bdd7 (patch)
tree745497a797e828a47da896164cff2950fe0d4371 /auth/auth-cass/docker
parentd41b490db09178a9da02cd20f6d2368b38ca6475 (diff)
Slight mod for Cass Dockerfile
Issue-ID: AAF-917 Change-Id: I5b086aa126c602513474569a56adbbc9360ee877 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-cass/docker')
-rw-r--r--auth/auth-cass/docker/Dockerfile.cass6
-rw-r--r--auth/auth-cass/docker/dcqlsh.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass
index 0406411f..c25135ed 100644
--- 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 92944f00..2518eb90 100644
--- 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