diff options
author | Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-02-13 16:39:57 -0500 |
---|---|---|
committer | Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-02-18 10:11:47 -0500 |
commit | 7019f6d9af89b6fadc72d3d9f1f303b5278e7555 (patch) | |
tree | fdd79713623b4349b64aa09a7aacb61ae2174787 /ccsdk-app-os/Dockerfile | |
parent | c73866cf44cad2be9a91ea1e2a3a77fcc29d9c2a (diff) |
DCAE dashboard updates ver 1.3.0
Update DB Schema to include new menu items for API doc
Update the page footer for latest copyright
Issue-ID: DCAEGEN2-1856
Issue-ID: DCAEGEN2-1556
Change-Id: Ia7f52b6f0151db62f2155fa26d0f50a1157e7481
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
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"] |