summaryrefslogtreecommitdiffstats
path: root/base_sdc-jetty
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2018-10-29 19:51:30 +0200
committerTal Gitelman <tg851x@intl.att.com>2018-10-29 19:51:30 +0200
commitd18094dfca7558771c8ac08893b069c0dfd44a23 (patch)
tree7225d8e9ac5845ff3a5b1edeab453f7fe15a9886 /base_sdc-jetty
parent28fc3deb05c170d4b4e08e5431bd37c29f3d64a1 (diff)
upgrading jetty
Change-Id: If2e184523a8a6f6544a696f12e9905418c2a6368 Issue-ID: SDC-1767 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'base_sdc-jetty')
-rw-r--r--base_sdc-jetty/Dockerfile32
1 files changed, 16 insertions, 16 deletions
diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile
index 6a43ef0..2bab202 100644
--- a/base_sdc-jetty/Dockerfile
+++ b/base_sdc-jetty/Dockerfile
@@ -1,35 +1,35 @@
-FROM jetty:9.3-jre8-alpine
+FROM jetty:9.4-jre8-alpine
USER root
# Install Chef
RUN set -ex && \
+ apk update && \
apk add --no-cache \
- jq=1.5-r5 \
- curl=7.60.0-r1 \
- curl-dev=7.60.0-r1 \
- openssl-dev=1.0.2o-r0 \
- vim=8.0.1359-r0 \
- bash=4.4.19-r1 \
- build-base=0.5-r0 \
- ruby=2.4.4-r0 \
- ruby-dev=2.4.4-r0 \
- libffi-dev=3.2.1-r4 \
- libxml2-dev=2.9.7-r0 && \
+ jq \
+ curl \
+ curl-dev \
+ libressl-dev \
+ vim=8.1.0115-r0 \
+ bash \
+ build-base \
+ ruby=2.5.2-r0 \
+ ruby-dev \
+ libffi-dev \
+ libxml2-dev && \
gem install \
chef:13.8.5 \
berkshelf:6.3.1 \
io-console:0.4.6 \
+ etc webrick \
--no-document && \
echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
apk update && \
- apk add binutils=2.30-r1 jq=1.6_rc1-r1 libtasn1=4.13-r0
+ apk add binutils jq libtasn1
# Replace Jetty user ID
COPY set_jetty_user.sh /tmp/set_jetty_user.sh
-RUN sh -x /tmp/set_jetty_user.sh && rm -f /tmp/set_jetty_user.sh
-RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/lib/jetty
+RUN sh -x /tmp/set_jetty_user.sh && rm -f /tmp/set_jetty_user.sh && chown -R jetty:jetty ${JETTY_BASE}/webapps /var/lib/jetty
USER jetty
-