aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/sdc-backend/Dockerfile4
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile6
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile6
3 files changed, 5 insertions, 11 deletions
diff --git a/catalog-be/sdc-backend/Dockerfile b/catalog-be/sdc-backend/Dockerfile
index 7fd978947f..fc0c9cffa2 100644
--- a/catalog-be/sdc-backend/Dockerfile
+++ b/catalog-be/sdc-backend/Dockerfile
@@ -4,12 +4,10 @@ COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
-ADD catalog-be-*.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty catalog-be-*.war ${JETTY_BASE}/webapps/
USER root
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
-
COPY startup.sh /root/
RUN chmod 770 /root/startup.sh
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 63618fc878..a4273f3d8a 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -4,14 +4,12 @@ COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
-ADD onboarding*.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty onboarding*.war ${JETTY_BASE}/webapps/
-ADD catalog-fe-*.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty 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
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index f49b2847d4..b499966e93 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -4,14 +4,12 @@ COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
-ADD onboarding-be-*.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty onboarding-be-*.war ${JETTY_BASE}/webapps/
-ADD api-docs.war ${JETTY_BASE}/webapps/
+ADD --chown=jetty:jetty api-docs.war ${JETTY_BASE}/webapps/
USER root
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps
-
COPY startup.sh /root/
RUN chmod 770 /root/startup.sh