diff options
| author |   Tony Hansen <tony@att.com> | 2019-08-18 22:32:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-18 22:32:45 +0000 |
| commit | 8eff8ceaab203243e3d0914cead50f16d6097ea6 (patch) | |
| tree | 67bce4c061e486e4b665c29837b596ec83f5062e | |
| parent | 9fbed78169f83658e8736869db6dfa9bd942ed67 (diff) | |
| parent | 492fa09a438065371559aabcc2d59e7dc9867092 (diff) | |
Merge "rollback non-root userchange" into el-alto
| -rw-r--r-- | tca-cdap-container/Dockerfile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tca-cdap-container/Dockerfile b/tca-cdap-container/Dockerfile index 36366b4..18f9a85 100644 --- a/tca-cdap-container/Dockerfile +++ b/tca-cdap-container/Dockerfile @@ -16,15 +16,9 @@ FROM caskdata/cdap-standalone:4.1.2 -ARG USER_GROUP=tca-cdap-group -ARG NON_ROOT_USER=tca-cdap - -#Add a new user and group to allow container to be run as non-root -RUN addgroup --system ${USER_GROUP} && adduser --system ${NON_ROOT_USER} --ingroup ${USER_GROUP} RUN apt-get update && apt-get install -y netcat jq iputils-ping wget vim curl COPY get-tca.sh /opt/tca/get-tca.sh -RUN chmod -R 777 /opt/tca/* -RUN chmod 755 /opt/tca/get-tca.sh +RUN /opt/tca/get-tca.sh COPY tca_app_config.json /opt/tca/tca_app_config.json COPY tca_app_preferences.json /opt/tca/tca_app_preferences.json COPY restart.sh /opt/tca/restart.sh @@ -39,6 +33,4 @@ RUN chmod 755 /opt/tca/mr-watchdog.sh EXPOSE 11011 EXPOSE 11015 -USER ${NON_ROOT_USER}:${USER_GROUP} - ENTRYPOINT /opt/tca/restart.sh |