diff options
Diffstat (limited to 'openecomp-be/dist')
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile | 13 | ||||
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile | 6 |
2 files changed, 6 insertions, 13 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index 6eb57a625e..7257161f78 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/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 @@ -14,11 +14,8 @@ RUN set -ex && \ libffi-dev \ libxml2-dev \ libressl-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 @@ -32,8 +29,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 diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile index d2307b1380..81594ca3da 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -24,11 +24,7 @@ RUN apt-get update --allow-releaseinfo-change && \ 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 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 && \ apt-get update -y && apt-get remove bash -y --allow-remove-essential && \ apt-get install -y binutils && apt-get clean && gem cleanup |