diff options
| author |   vasraz <vasyl.razinkov@est.tech> | 2022-08-20 10:13:09 +0100 |
|---|---|---|
| committer | Vasyl Razinkov <vasyl.razinkov@est.tech> | 2022-09-01 08:18:12 +0000 |
| commit | a062326d5c284d58dc009387f4c30488d2fdbb43 (patch) | |
| tree | 11a3f16477109e39f4ae8f1d610f6f99676d8e73 | |
| parent | 5ae80618434419a4fbf773e05e8771e067f3e25f (diff) | |
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
(cherry picked from commit 9efabf266f2c21ba7aa30a2ddea5eabfc145ac43)
7 files changed, 14 insertions, 0 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile index f18eb7084c..551c52dd2c 100644 --- a/asdctool/sdc-cassandra-init/Dockerfile +++ b/asdctool/sdc-cassandra-init/Dockerfile @@ -22,6 +22,8 @@ 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 && \ 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..2714a357d8 100644 --- a/catalog-be/sdc-backend-init/Dockerfile +++ b/catalog-be/sdc-backend-init/Dockerfile @@ -22,6 +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 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..b8d57179b8 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/Dockerfile @@ -12,6 +12,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 chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile index d0978a9ba8..fd12356e6e 100644 --- a/catalog-fe/sdc-frontend/Dockerfile +++ b/catalog-fe/sdc-frontend/Dockerfile @@ -12,6 +12,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 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-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile index aa9929c2c4..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,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 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..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,8 @@ 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 && \ 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..b5b36fa23d 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -12,6 +12,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 chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ gem cleanup && \ apk update |