diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2023-06-06 17:12:59 +0100 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2023-06-06 19:00:34 +0000 |
| commit | 36edaac642e0ec65e0d2287d7d8cbcbe15c2914a (patch) | |
| tree | e11e57d747471a97a04c5c777c1cec78d76b0390 /catalog-be | |
| parent | 11abcf3163405b3dae8b0520da4babb007337a3b (diff) | |
Improve build image time
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I325b2ba1626effee614e5e82aead4a01adb13c5d
Issue-ID: SDC-4526
Diffstat (limited to 'catalog-be')
| -rw-r--r-- | catalog-be/sdc-backend-init/Dockerfile | 7 | ||||
| -rw-r--r-- | catalog-be/src/main/docker/backend/Dockerfile | 13 |
2 files changed, 7 insertions, 13 deletions
diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile index 25e2e58ef5..76e502ab16 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -22,11 +22,8 @@ RUN apk update && \ python -m pip install --upgrade pip \ pip install 'pycurl==7.44.1' && \ set -ex && \ - 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 && \ apk del .build-dependencies && \ gem cleanup diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile index d33f67c156..050ccfd0dc 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/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 && \ - 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 |