aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asdctool/sdc-cassandra-init/Dockerfile3
-rw-r--r--asdctool/sdc-cassandra-init/startup.sh2
-rw-r--r--catalog-be/sdc-backend-init/Dockerfile10
-rw-r--r--catalog-be/src/main/docker/backend/Dockerfile7
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile14
-rw-r--r--integration-tests/integration-tests-init/Dockerfile6
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile10
-rw-r--r--openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile6
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile8
9 files changed, 33 insertions, 33 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index f275769516..6266e28f67 100644
--- 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 2a20eaa67d..d48456a355 100644
--- 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 b7848bf510..9681734268 100644
--- 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 eb52aaacc8..e1647c0321 100644
--- 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 fd19557f3f..9fdfd78c0b 100644
--- 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 6e06d4d720..d3ba469c91 100644
--- 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 5eb711fa78..fc809b5afe 100644
--- 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 4f73e9e3fd..6560e7f2a6 100644
--- 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 2a40fb4070..3a776133a4 100644
--- 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