From 101e0a83d8a6b4690dafe72543b245e25af9255a Mon Sep 17 00:00:00 2001 From: vasraz Date: Thu, 9 Jun 2022 19:36:13 +0100 Subject: Fix broken images build due to multipart-post gem Maximum supported version of multipart-post, with the current images Ruby & RubyGems is 2.2.0. Forcing the 2.2.0 version. Signed-off-by: Vasyl Razinkov Change-Id: Ie7a7232be817f005c36f09b023344b479c64457f Issue-ID: SDC-4041 --- asdctool/sdc-cassandra-init/Dockerfile | 1 + catalog-be/sdc-backend-init/Dockerfile | 1 + catalog-be/src/main/docker/backend/Dockerfile | 3 ++- catalog-fe/sdc-frontend/Dockerfile | 3 ++- openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile | 1 + openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile | 1 + utils/webseal-simulator/sdc-simulator/Dockerfile | 1 + 7 files changed, 9 insertions(+), 2 deletions(-) diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index f18eb7084c..35ce795775 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip & ruby-dev \ libffi-dev \ libxml2-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc 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 diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile index 8f6da77d19..1b9de33072 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -22,6 +22,7 @@ RUN apk update && \ python -m pip install --upgrade pip \ pip install 'pycurl==7.44.1' && \ set -ex && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc 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 902695519b..265d002ae3 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -12,6 +12,7 @@ RUN set -ex && \ ruby-dev \ libffi-dev \ libxml2-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update @@ -40,4 +41,4 @@ COPY --chown=onap:onap startup.sh $JETTY_FOLDER/ RUN chmod 770 $JETTY_FOLDER/startup.sh -ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] \ No newline at end of file +ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index d0978a9ba8..a86062381a 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -12,6 +12,7 @@ RUN set -ex && \ ruby-dev \ libffi-dev \ libxml2-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update @@ -40,4 +41,4 @@ COPY --chown=onap:onap startup.sh $JETTY_FOLDER RUN chmod 770 $JETTY_FOLDER/startup.sh -ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] \ No newline at end of file +ENTRYPOINT [ "sh", "-c", "${JETTY_HOME}/startup.sh"] diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index aa9929c2c4..f6ed6c4951 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -13,6 +13,7 @@ RUN set -ex && \ libffi-dev \ libxml2-dev \ libressl-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update 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 abd09a9767..c22fed7d00 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip & ruby-dev \ libffi-dev \ libxml2-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc 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 diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 6497ff810f..66092e0254 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -12,6 +12,7 @@ RUN set -ex && \ ruby-dev \ libffi-dev \ libxml2-dev && \ + gem install multipart-post -v 2.2.0 --no-document && \ gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update -- cgit 1.2.3-korg