aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-10-24 14:54:53 +0300
committerTal Gitelman <tg851x@intl.att.com>2017-10-24 14:54:53 +0300
commit0a722cd49d6996afa1013ba994357ec7f7220aca (patch)
tree6234e4edc86dfd8ae7c7c272fc7d70baf764cf3a
parentb0403b04e15925fc7bdd61f59e081bf11a00d0e2 (diff)
Update SDC-Simulator base image to the latest
Change-Id: Idcb9c19fd4cefbac3955404f4e66e993c4d59ef1 Issue-Id: SDC-527 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile2
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile4
3 files changed, 3 insertions, 5 deletions
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" ]