From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- sdc-os-chef/sdc-backend/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sdc-os-chef/sdc-backend/Dockerfile') diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile index 128387ae14..e43a156d47 100644 --- a/sdc-os-chef/sdc-backend/Dockerfile +++ b/sdc-os-chef/sdc-backend/Dockerfile @@ -1,4 +1,4 @@ -FROM jetty:9.3.15-jre8 +FROM jetty:9.3-jre8 RUN apt-get -y update RUN apt-get -y install apt-utils @@ -16,12 +16,10 @@ RUN pip install pycurl # install chef-solo RUN curl -L https://omnitruck.chef.io/install.sh | bash -ADD onboarding-be-__SDC-RELEASE__.war ${JETTY_BASE}/webapps/ -ADD catalog-be-__SDC-RELEASE__.war ${JETTY_BASE}/webapps/ +ADD onboarding-be-*.war ${JETTY_BASE}/webapps/ +ADD catalog-be-*.war ${JETTY_BASE}/webapps/ RUN chown -R jetty:jetty ${JETTY_BASE}/webapps COPY startup.sh /root/ - RUN chmod 770 /root/startup.sh - ENTRYPOINT [ "/root/startup.sh" ] -- cgit 1.2.3-korg