From 9efabf266f2c21ba7aa30a2ddea5eabfc145ac43 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Sat, 20 Aug 2022 10:13:09 +0100
Subject: [PATCH] Fix broken chef/berkshelf install in docker images

Set a specific version for the ruby gem "public_suffix", required by chef/berkshelf,
to be compatible with the used version of ruby (2.5.0).

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I963a60206cb1f22296fcb5a9f763f326f629f077
Issue-ID: SDC-4139
---
 asdctool/sdc-cassandra-init/Dockerfile                            | 1 +
 catalog-be/sdc-backend-init/Dockerfile                            | 1 +
 catalog-be/src/main/docker/backend/Dockerfile                     | 1 +
 catalog-fe/sdc-frontend/Dockerfile                                | 1 +
 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, 7 insertions(+)

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index 35ce795775..551c52dd2c 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 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 && \
     apt-get update -y && apt-get remove bash -y --allow-remove-essential && \
diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile
index 1b9de33072..2714a357d8 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 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 && \
     apk del .build-dependencies && \
diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile
index 265d002ae3..cd8865666b 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 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 cleanup && \
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index a86062381a..6f62db45a4 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 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 cleanup && \
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index f6ed6c4951..a9ab7a9d62 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 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 cleanup && \
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 c22fed7d00..b5b3c4d10f 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 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 && \
     apt-get update -y && apt-get remove bash -y --allow-remove-essential && \
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 66092e0254..b5b36fa23d 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 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 cleanup && \
-- 
2.16.6