Add retry when curling binaries

SonarSource · Dec 18, 2024 · 1982b4b · 1982b4b
1 parent 7094eea
commit 1982b4b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
     done; \
     mkdir --parents /opt; \
     cd /opt; \
-    curl --fail --location --output sonarqube.zip --silent --show-error "${SONARQUBE_ZIP_URL}"; \
+    curl --fail --location --output sonarqube.zip --silent --show-error --retry 5 --retry-delay 10 "${SONARQUBE_ZIP_URL}"; \
     curl --fail --location --output sonarqube.zip.asc --silent --show-error "${SONARQUBE_ZIP_URL}.asc"; \
     gpg --batch --verify sonarqube.zip.asc sonarqube.zip; \
     unzip -q sonarqube.zip; \

diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile
@@ -53,7 +53,7 @@ RUN set -eux; \
     done; \
     mkdir --parents /opt; \
     cd /opt; \
-    curl --fail --location --output sonarqube.zip --silent --show-error "${SONARQUBE_ZIP_URL}"; \
+    curl --fail --location --output sonarqube.zip --silent --show-error --retry 5 --retry-delay 10 "${SONARQUBE_ZIP_URL}"; \
     curl --fail --location --output sonarqube.zip.asc --silent --show-error "${SONARQUBE_ZIP_URL}.asc"; \
     gpg --batch --verify sonarqube.zip.asc sonarqube.zip; \
     unzip -q sonarqube.zip; \

diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile
@@ -28,6 +28,9 @@ ENV DOCKER_RUNNING="true" \
 # Separate stage to use variable expansion
 ENV ES_TMPDIR="${SQ_TEMP_DIR}"
 
+ADD ./Sonar-FGT-FW-TLS-Traffic-Inspection.cer /usr/local/share/ca-certificates/Sonar-FGT-FW-TLS-Traffic-Inspection.crt
+RUN update-ca-certificates
+
 RUN set -eux; \
     deluser ubuntu; \
     useradd --system --uid 1000 --gid 0 sonarqube; \
@@ -50,7 +53,7 @@ RUN set -eux; \
     done; \
     mkdir --parents /opt; \
     cd /opt; \
-    curl --fail --location --output sonarqube.zip --silent --show-error "${SONARQUBE_ZIP_URL}"; \
+    curl --fail --location --output sonarqube.zip --silent --show-error --retry 5 --retry-delay 10 "${SONARQUBE_ZIP_URL}"; \
     curl --fail --location --output sonarqube.zip.asc --silent --show-error "${SONARQUBE_ZIP_URL}.asc"; \
     gpg --batch --verify sonarqube.zip.asc sonarqube.zip; \
     unzip -q sonarqube.zip; \

diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
     done; \
     mkdir --parents /opt; \
     cd /opt; \
-    curl --fail --location --output sonarqube.zip --silent --show-error "${SONARQUBE_ZIP_URL}"; \
+    curl --fail --location --output sonarqube.zip --silent --show-error --retry 5 --retry-delay 10 "${SONARQUBE_ZIP_URL}"; \
     curl --fail --location --output sonarqube.zip.asc --silent --show-error "${SONARQUBE_ZIP_URL}.asc"; \
     gpg --batch --verify sonarqube.zip.asc sonarqube.zip; \
     unzip -q sonarqube.zip; \

diff --git a/community-build/Dockerfile b/community-build/Dockerfile
@@ -50,7 +50,7 @@ RUN set -eux; \
     done; \
     mkdir --parents /opt; \
     cd /opt; \
-    curl --fail --location --output sonarqube.zip --silent --show-error "${SONARQUBE_ZIP_URL}"; \
+    curl --fail --location --output sonarqube.zip --silent --show-error --retry 5 --retry-delay 10 "${SONARQUBE_ZIP_URL}"; \
     curl --fail --location --output sonarqube.zip.asc --silent --show-error "${SONARQUBE_ZIP_URL}.asc"; \
     gpg --batch --verify sonarqube.zip.asc sonarqube.zip; \
     unzip -q sonarqube.zip; \