summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreschcam <cameron.scholes@est.tech>2023-05-10 13:49:55 +0100
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-05-12 08:19:23 +0000
commit30a2a7f615252b1ba6b6f68ed668e58cc2bf6d99 (patch)
tree8ded33cf1adc0187230c7a6cece06d9a67d42961
parentc0ebdaed48747d28fac437f7139956378df589e9 (diff)
Add retry option to wget commands
Issue-ID: SDC-4495 Signed-off-by: eschcam <cameron.scholes@est.tech> Change-Id: I3c3a2654daeeb8c7e57b60d5684026aaa0aa0670
-rw-r--r--catalog-be/src/main/docker/backend/Dockerfile3
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile3
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile3
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile3
4 files changed, 8 insertions, 4 deletions
diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile
index 5f83e75db6..c5c36d6bc0 100644
--- a/catalog-be/src/main/docker/backend/Dockerfile
+++ b/catalog-be/src/main/docker/backend/Dockerfile
@@ -7,6 +7,7 @@ ARG JETTY_FOLDER=/app/jetty
RUN set -ex && \
apk update && \
apk add --no-cache \
+ wget \
build-base \
ruby \
ruby-dev \
@@ -30,7 +31,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
USER onap
#Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz && \
tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
rm -rf $JETTY_FOLDER/jetty.tar.gz
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 341dda2410..398d629f5e 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -7,6 +7,7 @@ ARG JETTY_FOLDER=/app/jetty
RUN set -ex && \
apk update && \
apk add --no-cache \
+ wget \
build-base \
ruby \
ruby-dev \
@@ -30,7 +31,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
USER onap
#Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz -c && \
tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
rm -rf $JETTY_FOLDER/jetty.tar.gz
RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index cc34c81f09..6f2e68ec0a 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -7,6 +7,7 @@ ARG JETTY_FOLDER=/app/jetty
RUN set -ex && \
apk update && \
apk add --no-cache \
+ wget \
build-base \
ruby \
ruby-dev \
@@ -31,7 +32,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
USER onap
#Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz -c && \
tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
rm -rf $JETTY_FOLDER/jetty.tar.gz
RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml
diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 22e74dfdb3..16d1ab0afb 100644
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -7,6 +7,7 @@ ARG JETTY_FOLDER=/app/jetty
RUN set -ex && \
apk update && \
apk add --no-cache \
+ wget \
build-base \
ruby \
ruby-dev \
@@ -30,7 +31,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
USER onap
#Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty-distribution.version}/jetty-distribution-${jetty-distribution.version}.tar.gz --tries=3 -O $JETTY_FOLDER/jetty.tar.gz -c && \
tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
rm -rf $JETTY_FOLDER/jetty.tar.gz
RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml