diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-02-18 17:41:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-18 17:41:14 +0000 |
| commit | 363e03d53bf39f7da2608998a82f194abe7bb3dc (patch) | |
| tree | 22d207cb6d88ccb7290dd2d99a91d8762a56a09f /ccsdk-app-os/Dockerfile | |
| parent | 7700459509e78a85115e20f459dcc803f00a788a (diff) | |
| parent | 7019f6d9af89b6fadc72d3d9f1f303b5278e7555 (diff) | |
Merge "DCAE dashboard updates ver 1.3.0"
Diffstat (limited to 'ccsdk-app-os/Dockerfile')
| -rw-r--r-- | ccsdk-app-os/Dockerfile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/ccsdk-app-os/Dockerfile b/ccsdk-app-os/Dockerfile index 1e66e38..7c1769e 100644 --- a/ccsdk-app-os/Dockerfile +++ b/ccsdk-app-os/Dockerfile @@ -1,25 +1,21 @@ # Use an official Tomcat base image -FROM tomcat:8.5-alpine +FROM tomcat:8 ENV APPDIR /usr/local/tomcat - ENV APPUSER dash -RUN adduser -u 1000 -D ${APPUSER} - -WORKDIR ${APPDIR} - COPY docker-dashboard-installation.sh /tmp/docker-dashboard-installation.sh COPY create_table.sql /tmp/create_table.sql RUN mkdir /home/deployments \ + && mkdir -p /opt/logs/dcae/dashboard \ + && useradd -u 1000 -M -U ${APPUSER} \ && chown -R 1000:1000 ${APPDIR} \ && chown -R 1000:1000 /home/deployments \ - && apk update \ - && apk add zip \ - && apk add vim \ - && apk add dos2unix \ - && apk add postgresql \ + && chown -R 1000:1000 /opt/logs/dcae/dashboard \ + && apt-get update \ + && apt-get install -y sudo zip vim dos2unix postgresql \ + && echo "dash ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/dash_update_cert_store \ && dos2unix /tmp/create_table.sql \ && dos2unix /tmp/docker-dashboard-installation.sh \ && chmod +x /tmp/create_table.sql \ @@ -28,6 +24,7 @@ RUN mkdir /home/deployments \ ARG WAR_FILE COPY target/${WAR_FILE} /home/deployments/ccsdk-app.war +WORKDIR ${APPDIR} USER ${APPUSER} CMD ["/tmp/docker-dashboard-installation.sh"] |