Fix ruby dependency issues for SDC components

- downgraded chef to 13.8.5
- updated rspec-its to 1.3.0
- updated hitimes to 1.3.1

Issue-ID: SDC-4701
Change-Id: I55c788dab14a712181ea24b8fd8ad048762fdb1d
Signed-off-by: Anamika Khantwal <anamika.khantwal@accenture.com>

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index f275769..6266e28 100644 (file)
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -22,9 +22,10 @@ RUN apk update &&  \
         ruby \
         ruby-dev \
         libffi-dev \
+        libressl-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
         faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
         io-console:0.7.2 \
         webrick \

diff --git a/asdctool/sdc-cassandra-init/startup.sh b/asdctool/sdc-cassandra-init/startup.sh
index 2a20eaa..d48456a 100644 (file)
--- a/asdctool/sdc-cassandra-init/startup.sh
+++ b/asdctool/sdc-cassandra-init/startup.sh
@@ -3,4 +3,4 @@
 cd /home/sdc/chef-solo
 chef-solo -c solo.rb  -E ${ENVNAME}
 rc=$?
-if [ $rc -ne 0 ]; then exit $rc; fi
+if [ $rc -ne 0 ]; then exit $rc; fi
\ No newline at end of file

diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile
index b7848bf..9681734 100644 (file)
--- a/catalog-be/sdc-backend-init/Dockerfile
+++ b/catalog-be/sdc-backend-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/integration-python:9.1.0
+FROM onap/integration-python:9.0.0
 
 USER root
 
@@ -12,6 +12,7 @@ RUN apk update && \
         libcurl \
         ruby && \
     apk add --no-cache --virtual .build-dependencies \
+        libressl-dev \
         ruby-dev \
         libffi-dev \
         libxml2-dev \
@@ -22,11 +23,10 @@ RUN apk update && \
     pip install 'pycurl==7.44.1' && \
     set -ex && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 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 \
-        json \
         --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 eb52aaa..e1647c0 100644 (file)
--- a/catalog-be/src/main/docker/backend/Dockerfile
+++ b/catalog-be/src/main/docker/backend/Dockerfile
@@ -14,11 +14,10 @@ RUN set -ex && \
         libffi-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 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 \
-        json \
         --no-document && \
     gem cleanup
 

diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index fd19557..9fdfd78 100644 (file)
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -14,9 +14,9 @@ RUN set -ex && \
         libffi-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \
+        faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \
+        io-console:0.4.6 \
         webrick \
         json \
         --no-document && \
@@ -39,10 +39,10 @@ RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
 
 RUN mkdir -p $JETTY_FOLDER/config/catalog-fe
 COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/
-COPY --chown=onap:onap  chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/
-ADD --chown=onap:onap onboarding*.war         $JETTY_FOLDER/webapps/
-ADD --chown=onap:onap  catalog-fe-*.war        $JETTY_FOLDER/webapps/
-COPY --chown=onap:onap  startup.sh $JETTY_FOLDER
+COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/
+ADD --chown=onap:onap onboarding*.war $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap catalog-fe-*.war $JETTY_FOLDER/webapps/
+COPY --chown=onap:onap startup.sh $JETTY_FOLDER
 
 RUN chmod 770 $JETTY_FOLDER/startup.sh
 

diff --git a/integration-tests/integration-tests-init/Dockerfile b/integration-tests/integration-tests-init/Dockerfile
index 6e06d4d..d3ba469 100644 (file)
--- a/integration-tests/integration-tests-init/Dockerfile
+++ b/integration-tests/integration-tests-init/Dockerfile
@@ -23,9 +23,9 @@ RUN apk update && \
     pip install 'pycurl==7.44.1' &&  \
     set -ex && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \
+        faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \
+        io-console:0.4.6 \
         webrick \
         json \
         --no-document && \

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index 5eb711f..fc809b5 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -14,9 +14,9 @@ RUN set -ex && \
         libffi-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \
+        faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \
+        io-console:0.4.6 \
         webrick \
         json \
         --no-document && \
@@ -39,8 +39,8 @@ RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
 
 COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/
 COPY --chown=onap:onap chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/
-ADD --chown=onap:onap onboarding-be-*.war    $JETTY_FOLDER/webapps/
-ADD --chown=onap:onap api-docs.war           $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap onboarding-be-*.war $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap api-docs.war $JETTY_FOLDER/webapps/
 COPY --chown=onap:onap startup.sh $JETTY_FOLDER/
 
 RUN chmod 770 $JETTY_FOLDER/startup.sh

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 4f73e9e..6560e7f 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
@@ -24,9 +24,9 @@ RUN apk update &&  \
         libffi-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \
+        faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \
+        io-console:0.4.6 \
         webrick \
         json \
         --no-document && \

diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 2a40fb4..3a77613 100644 (file)
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -14,9 +14,9 @@ RUN set -ex && \
         libffi-dev \
         libxml2-dev && \
     gem install --no-update-sources \
-        public_suffix:5.1.1 multipart-post:2.4.1 etc:1.4.3 bundler:2.4.22 chef:14.15.6 \
-        faraday:2.8.1 minitar:0.12.1 berkshelf:7.0.10 \
-        io-console:0.7.2 \
+        rspec-its:1.3.0 hitimes:1.3.1 public_suffix:4.0.7 multipart-post:2.2.0 etc:1.3.0 bundler:2.3.26 chef:13.8.5 \
+        faraday:2.8.1 minitar:0.12.1 berkshelf:6.3.1 \
+        io-console:0.4.6 \
         webrick \
         json \
         --no-document && \
@@ -39,7 +39,7 @@ RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
 
 COPY --chown=onap:onap chef-solo $JETTY_FOLDER/chef-solo/
 COPY --chown=onap:onap  chef-repo/cookbooks $JETTY_FOLDER/chef-solo/cookbooks/
-ADD --chown=onap:onap WSSimulator*.war                         $JETTY_FOLDER/webapps/
+ADD --chown=onap:onap WSSimulator*.war $JETTY_FOLDER/webapps/
 COPY --chown=onap:onap startup.sh $JETTY_FOLDER/
 
 RUN chmod 770 $JETTY_FOLDER/startup.sh