diff options
Diffstat (limited to 'catalog-fe')
| -rw-r--r-- | catalog-fe/sdc-frontend/Dockerfile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 2fc669e63a..2ec22ee0cd 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/integration-java11:9.0.0 +FROM onap/integration-java11:10.0.0 USER root ARG JETTY_FOLDER=/app/jetty @@ -13,11 +13,8 @@ RUN set -ex && \ ruby-dev \ libffi-dev \ libxml2-dev && \ - gem install public_suffix -v 4.0.7 --no-document && \ - gem install multipart-post -v 2.2.0 --no-document && \ - gem install etc -v 1.3.0 --no-document && \ - gem install bundler -v 2.3.26 --no-document && \ - gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 webrick --no-document && \ + gem update --system --no-document && \ + gem install --no-update-sources public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 webrick --no-document && \ gem cleanup && \ apk update @@ -31,8 +28,8 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER USER onap #Download jetty -RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz -c && \ - tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \ +RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz && \ + tar xz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \ rm -rf $JETTY_FOLDER/jetty.tar.gz RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml |