From 52d23fc161d88fba7fefc76b89478e8abab42970 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 28 Dec 2022 12:24:21 +0000 Subject: [PATCH] Fix broken build Use fixed version of bundler (2.3.26) Signed-off-by: Vasyl Razinkov Change-Id: I0e62db76e00b9b8932eca4a700db9c89e7e31c17 Issue-ID: SDC-4314 --- asdctool/sdc-cassandra-init/Dockerfile | 1 + catalog-be/sdc-backend-init/Dockerfile | 3 ++- catalog-be/src/main/docker/backend/Dockerfile | 3 ++- catalog-fe/sdc-frontend/Dockerfile | 4 +++- openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile | 4 +++- openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile | 1 + utils/webseal-simulator/sdc-simulator/Dockerfile | 4 +++- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index 71e51be64f..cecb1f3c8a 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip & 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 && \ 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 2851e1416c..25e2e58ef5 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -24,8 +24,9 @@ RUN apk update && \ set -ex && \ gem install public_suffix -v 4.0.7 --no-document && \ 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 webrick --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 && \ 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 7ff5c2b48a..db2ab154ca 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -14,8 +14,9 @@ RUN set -ex && \ libxml2-dev && \ gem install public_suffix -v 4.0.7 --no-document && \ 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 webrick --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 cleanup && \ apk update diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index 6f62db45a4..7de4b1f3fd 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -14,7 +14,9 @@ RUN set -ex && \ libxml2-dev && \ gem install public_suffix -v 4.0.7 --no-document && \ 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 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 cleanup && \ apk update diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index a9ab7a9d62..f0f9d5fa42 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile @@ -15,7 +15,9 @@ RUN set -ex && \ libressl-dev && \ gem install public_suffix -v 4.0.7 --no-document && \ 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 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 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 371c977bc1..ce5fc02bd3 100644 --- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile +++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update --allow-releaseinfo-change && apt-get install -y python-pip & 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 && \ 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 b5b36fa23d..5f30e8cc7a 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -14,7 +14,9 @@ RUN set -ex && \ libxml2-dev && \ gem install public_suffix -v 4.0.7 --no-document && \ 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 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 cleanup && \ apk update -- 2.16.6