From: Tal Gitelman Date: Tue, 24 Oct 2017 11:54:53 +0000 (+0300) Subject: Update SDC-Simulator base image to the latest X-Git-Tag: v1.2.0~790 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F20343%2F1;p=sdc.git Update SDC-Simulator base image to the latest Change-Id: Idcb9c19fd4cefbac3955404f4e66e993c4d59ef1 Issue-Id: SDC-527 Signed-off-by: Tal Gitelman --- diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index 7c6d8bf723..e28a85d51e 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -18,6 +18,4 @@ COPY startup.sh /root/ RUN chmod 770 /root/startup.sh -USER jetty - ENTRYPOINT [ "/root/startup.sh" ] diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile index 91980cc423..5039b08034 100644 --- a/sdc-os-chef/sdc-frontend/Dockerfile +++ b/sdc-os-chef/sdc-frontend/Dockerfile @@ -18,6 +18,4 @@ COPY startup.sh /root/ RUN chmod 770 /root/startup.sh -USER jetty - ENTRYPOINT [ "/root/startup.sh" ] diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index d418d4628e..e1a415f2ce 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -8,10 +8,12 @@ RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.pr ADD WSSimulator*.war ${JETTY_BASE}/webapps/ +USER root + RUN chown -R jetty:jetty ${JETTY_BASE}/webapps COPY startup.sh /root/ -RUN chmod 770 /root/startup.sh +RUN chmod 777 /root/startup.sh ENTRYPOINT [ "/root/startup.sh" ]