summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-backend/Dockerfile
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-09 03:19:04 +0300
committerMichael Lando <ml636r@att.com>2017-06-09 03:19:04 +0300
commited64b5edff15e702493df21aa3230b81593e6133 (patch)
treea4cb01fdaccc34930a8db403a3097c0d1e40914b /sdc-os-chef/sdc-backend/Dockerfile
parent280f8015d06af1f41a3ef12e8300801c7a5e0d54 (diff)
[SDC-29] catalog 1707 rebase commit.
Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-backend/Dockerfile')
-rw-r--r--sdc-os-chef/sdc-backend/Dockerfile8
1 files changed, 3 insertions, 5 deletions
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" ]