summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-10-24 11:08:18 +0300
committerMichael Lando <ml636r@att.com>2017-10-24 11:08:18 +0300
commitaa61644704edc4b2ef231d75b537b38d0ae6d7c6 (patch)
treee9b3bdacf282496e9a15377e55a89cf7adf7b29b /sdc-os-chef
parentf5f8b3db15f352c5bd8489de7b499bcba2ddd2ec (diff)
Add user root for running commands
Add user root definition before run command Change-Id: I6dcb957a870ddc3524e5001203e4cc640ce94070 Issue-Id: SDC-525 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile12
-rw-r--r--sdc-os-chef/sdc-frontend/Dockerfile4
2 files changed, 12 insertions, 4 deletions
diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
index dd38726be3..7c6d8bf723 100644
--- a/sdc-os-chef/sdc-backend/Dockerfile
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -4,16 +4,20 @@ COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
-ADD onboarding-be-*.war ${JETTY_BASE}/webapps/
+ADD onboarding-be-*.war ${JETTY_BASE}/webapps/
-ADD catalog-be-*.war ${JETTY_BASE}/webapps/
+ADD catalog-be-*.war ${JETTY_BASE}/webapps/
-ADD api-docs.war ${JETTY_BASE}/webapps/
+ADD api-docs.war ${JETTY_BASE}/webapps/
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
+USER root
+
+RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
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 7f9207d545..91980cc423 100644
--- a/sdc-os-chef/sdc-frontend/Dockerfile
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -10,10 +10,14 @@ ADD onboarding*.war ${JETTY_BASE}/webapps/
ADD catalog-fe-*.war ${JETTY_BASE}/webapps/
+USER root
+
RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
COPY startup.sh /root/
RUN chmod 770 /root/startup.sh
+USER jetty
+
ENTRYPOINT [ "/root/startup.sh" ]