Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to SonarQube 10.4 #16192

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Upgrade to SonarQube 10.4 #16192

merged 1 commit into from
Feb 6, 2024

Conversation

antoine-vigneau-sonarsource
Copy link
Contributor

This upgrades to the newest SonarQube version.

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 5, 2024

Diff for 0788c61: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 46c9938..254e74e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Carmine Vassallo <carmine.vassallo@sonarsource.com> (@carminevassallo), Jeremy Cotineau <jeremy.cotineau@sonarsource.com> (@jCOTINEAU), Davi Koscianski Vidal <davi.koscianski-vidal@sonarsource.com> (@davividal)
 Architectures: amd64, arm64v8
 GitRepo: https://github.com/SonarSource/docker-sonarqube.git
-GitCommit: 242f073026e8d9368f72f83c6a2dbd368299121b
+GitCommit: 3e0bf72c78f7c4386f8262057c0faca56876256d
 
 Tags: 9.9.3-community, 9.9-community, 9-community, lts, lts-community
 Directory: 9/community
@@ -18,17 +18,17 @@ Directory: 9/developer
 Tags: 9.9.3-enterprise, 9.9-enterprise, 9-enterprise, lts-enterprise
 Directory: 9/enterprise
 
-Tags: 10.3.0-community, 10.3-community, 10-community, community, latest
+Tags: 10.4.0-community, 10.4-community, 10-community, community, latest
 Directory: 10/community
 
-Tags: 10.3.0-datacenter-app, 10.3-datacenter-app, 10-datacenter-app, datacenter-app
+Tags: 10.4.0-datacenter-app, 10.4-datacenter-app, 10-datacenter-app, datacenter-app
 Directory: 10/datacenter/app
 
-Tags: 10.3.0-datacenter-search, 10.3-datacenter-search, 10-datacenter-search, datacenter-search
+Tags: 10.4.0-datacenter-search, 10.4-datacenter-search, 10-datacenter-search, datacenter-search
 Directory: 10/datacenter/search
 
-Tags: 10.3.0-developer, 10.3-developer, 10-developer, developer
+Tags: 10.4.0-developer, 10.4-developer, 10-developer, developer
 Directory: 10/developer
 
-Tags: 10.3.0-enterprise, 10.3-enterprise, 10-enterprise, enterprise
+Tags: 10.4.0-enterprise, 10.4-enterprise, 10-enterprise, enterprise
 Directory: 10/enterprise
diff --git a/_bashbrew-list b/_bashbrew-list
index e51035f..bd59f9f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -18,16 +18,16 @@ sonarqube:10-datacenter-app
 sonarqube:10-datacenter-search
 sonarqube:10-developer
 sonarqube:10-enterprise
-sonarqube:10.3-community
-sonarqube:10.3-datacenter-app
-sonarqube:10.3-datacenter-search
-sonarqube:10.3-developer
-sonarqube:10.3-enterprise
-sonarqube:10.3.0-community
-sonarqube:10.3.0-datacenter-app
-sonarqube:10.3.0-datacenter-search
-sonarqube:10.3.0-developer
-sonarqube:10.3.0-enterprise
+sonarqube:10.4-community
+sonarqube:10.4-datacenter-app
+sonarqube:10.4-datacenter-search
+sonarqube:10.4-developer
+sonarqube:10.4-enterprise
+sonarqube:10.4.0-community
+sonarqube:10.4.0-datacenter-app
+sonarqube:10.4.0-datacenter-search
+sonarqube:10.4.0-developer
+sonarqube:10.4.0-enterprise
 sonarqube:community
 sonarqube:datacenter-app
 sonarqube:datacenter-search
diff --git a/sonarqube_datacenter-app/Dockerfile b/sonarqube_datacenter-app/Dockerfile
index 2a9e753..4cfe4d7 100644
--- a/sonarqube_datacenter-app/Dockerfile
+++ b/sonarqube_datacenter-app/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87286
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
@@ -23,10 +23,9 @@ ENV DOCKER_RUNNING="true" \
     SONAR_CLUSTER_ENABLED="true"
 
 RUN set -eux; \
-    groupadd --system --gid 1000 sonarqube; \
-    useradd --system --uid 1000 --gid sonarqube sonarqube; \
+    useradd --system --uid 1000 --gid 0 sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu iproute2; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu iproute2; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
@@ -47,8 +46,8 @@ RUN set -eux; \
     rm sonarqube.zip*; \
     rm -rf ${SONARQUBE_HOME}/bin/*; \
     ln -s "${SONARQUBE_HOME}/lib/sonar-application-${SONARQUBE_VERSION}.jar" "${SONARQUBE_HOME}/lib/sonarqube.jar"; \
-    chmod -R 555 ${SONARQUBE_HOME}; \
-    chmod -R ugo+wrX "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
+    chmod -R 550 ${SONARQUBE_HOME}; \
+    chmod -R 770 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
     apt-get remove -y gnupg unzip; \
     rm -rf /var/lib/apt/lists/*;
 
diff --git a/sonarqube_datacenter-search/Dockerfile b/sonarqube_datacenter-search/Dockerfile
index 03cbdc8..f972b39 100644
--- a/sonarqube_datacenter-search/Dockerfile
+++ b/sonarqube_datacenter-search/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87286
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
@@ -23,10 +23,9 @@ ENV DOCKER_RUNNING="true" \
     SONAR_CLUSTER_ENABLED="true"
 
 RUN set -eux; \
-    groupadd --system --gid 1000 sonarqube; \
-    useradd --system --uid 1000 --gid sonarqube sonarqube; \
+    useradd --system --uid 1000 --gid 0 sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu iproute2; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu iproute2; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
@@ -47,8 +46,8 @@ RUN set -eux; \
     rm sonarqube.zip*; \
     rm -rf ${SONARQUBE_HOME}/bin/*; \
     ln -s "${SONARQUBE_HOME}/lib/sonar-application-${SONARQUBE_VERSION}.jar" "${SONARQUBE_HOME}/lib/sonarqube.jar"; \
-    chmod -R 555 ${SONARQUBE_HOME}; \
-    chmod -R ugo+wrX "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
+    chmod -R 550 ${SONARQUBE_HOME}; \
+    chmod -R 770 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
     apt-get remove -y gnupg unzip curl; \
     rm -rf /var/lib/apt/lists/*;
 
diff --git a/sonarqube_developer/Dockerfile b/sonarqube_developer/Dockerfile
index 97dd0d7..2e04daa 100644
--- a/sonarqube_developer/Dockerfile
+++ b/sonarqube_developer/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87286
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
@@ -21,10 +21,9 @@ ENV DOCKER_RUNNING="true" \
     SQ_TEMP_DIR="/opt/sonarqube/temp"
 
 RUN set -eux; \
-    groupadd --system --gid 1000 sonarqube; \
-    useradd --system --uid 1000 --gid sonarqube sonarqube; \
+    useradd --system --uid 1000 --gid 0 sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
@@ -45,8 +44,8 @@ RUN set -eux; \
     rm sonarqube.zip*; \
     rm -rf ${SONARQUBE_HOME}/bin/*; \
     ln -s "${SONARQUBE_HOME}/lib/sonar-application-${SONARQUBE_VERSION}.jar" "${SONARQUBE_HOME}/lib/sonarqube.jar"; \
-    chmod -R 555 ${SONARQUBE_HOME}; \
-    chmod -R ugo+wrX "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
+    chmod -R 550 ${SONARQUBE_HOME}; \
+    chmod -R 770 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
     apt-get remove -y gnupg unzip; \
     rm -rf /var/lib/apt/lists/*;
 
diff --git a/sonarqube_enterprise/Dockerfile b/sonarqube_enterprise/Dockerfile
index 49e6777..9e548af 100644
--- a/sonarqube_enterprise/Dockerfile
+++ b/sonarqube_enterprise/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87286
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
@@ -21,10 +21,9 @@ ENV DOCKER_RUNNING="true" \
     SQ_TEMP_DIR="/opt/sonarqube/temp"
 
 RUN set -eux; \
-    groupadd --system --gid 1000 sonarqube; \
-    useradd --system --uid 1000 --gid sonarqube sonarqube; \
+    useradd --system --uid 1000 --gid 0 sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
@@ -45,8 +44,8 @@ RUN set -eux; \
     rm sonarqube.zip*; \
     rm -rf ${SONARQUBE_HOME}/bin/*; \
     ln -s "${SONARQUBE_HOME}/lib/sonar-application-${SONARQUBE_VERSION}.jar" "${SONARQUBE_HOME}/lib/sonarqube.jar"; \
-    chmod -R 555 ${SONARQUBE_HOME}; \
-    chmod -R ugo+wrX "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
+    chmod -R 550 ${SONARQUBE_HOME}; \
+    chmod -R 770 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
     apt-get remove -y gnupg unzip; \
     rm -rf /var/lib/apt/lists/*;
 
diff --git a/sonarqube_latest/Dockerfile b/sonarqube_latest/Dockerfile
index 965a3a2..67da215 100644
--- a/sonarqube_latest/Dockerfile
+++ b/sonarqube_latest/Dockerfile
@@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
 #
 # SonarQube setup
 #
-ARG SONARQUBE_VERSION=10.3.0.82913
+ARG SONARQUBE_VERSION=10.4.0.87286
 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
 ENV DOCKER_RUNNING="true" \
     JAVA_HOME='/opt/java/openjdk' \
@@ -21,10 +21,9 @@ ENV DOCKER_RUNNING="true" \
     SQ_TEMP_DIR="/opt/sonarqube/temp"
 
 RUN set -eux; \
-    groupadd --system --gid 1000 sonarqube; \
-    useradd --system --uid 1000 --gid sonarqube sonarqube; \
+    useradd --system --uid 1000 --gid 0 sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
@@ -45,8 +44,8 @@ RUN set -eux; \
     rm sonarqube.zip*; \
     rm -rf ${SONARQUBE_HOME}/bin/*; \
     ln -s "${SONARQUBE_HOME}/lib/sonar-application-${SONARQUBE_VERSION}.jar" "${SONARQUBE_HOME}/lib/sonarqube.jar"; \
-    chmod -R 555 ${SONARQUBE_HOME}; \
-    chmod -R ugo+wrX "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
+    chmod -R 550 ${SONARQUBE_HOME}; \
+    chmod -R 770 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"; \
     apt-get remove -y gnupg unzip; \
     rm -rf /var/lib/apt/lists/*;
 
diff --git a/sonarqube_lts-community/Dockerfile b/sonarqube_lts-community/Dockerfile
index aeff9d7..841bb79 100644
--- a/sonarqube_lts-community/Dockerfile
+++ b/sonarqube_lts-community/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux; \
     groupadd --system --gid 1000 sonarqube; \
     useradd --system --uid 1000 --gid sonarqube sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
diff --git a/sonarqube_lts-datacenter-app/Dockerfile b/sonarqube_lts-datacenter-app/Dockerfile
index 6eb6749..a13a7d3 100644
--- a/sonarqube_lts-datacenter-app/Dockerfile
+++ b/sonarqube_lts-datacenter-app/Dockerfile
@@ -25,7 +25,7 @@ RUN set -eux; \
     groupadd --system --gid 1000 sonarqube; \
     useradd --system --uid 1000 --gid sonarqube sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu iproute2; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu iproute2; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
diff --git a/sonarqube_lts-datacenter-search/Dockerfile b/sonarqube_lts-datacenter-search/Dockerfile
index c00c3a6..6c4135e 100644
--- a/sonarqube_lts-datacenter-search/Dockerfile
+++ b/sonarqube_lts-datacenter-search/Dockerfile
@@ -25,7 +25,7 @@ RUN set -eux; \
     groupadd --system --gid 1000 sonarqube; \
     useradd --system --uid 1000 --gid sonarqube sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu iproute2; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu iproute2; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
diff --git a/sonarqube_lts-developer/Dockerfile b/sonarqube_lts-developer/Dockerfile
index 0c4387a..1ee7197 100644
--- a/sonarqube_lts-developer/Dockerfile
+++ b/sonarqube_lts-developer/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux; \
     groupadd --system --gid 1000 sonarqube; \
     useradd --system --uid 1000 --gid sonarqube sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25
diff --git a/sonarqube_lts-enterprise/Dockerfile b/sonarqube_lts-enterprise/Dockerfile
index ba8cd3a..a352928 100644
--- a/sonarqube_lts-enterprise/Dockerfile
+++ b/sonarqube_lts-enterprise/Dockerfile
@@ -23,7 +23,7 @@ RUN set -eux; \
     groupadd --system --gid 1000 sonarqube; \
     useradd --system --uid 1000 --gid sonarqube sonarqube; \
     apt-get update; \
-    apt-get install -y gnupg unzip curl bash fonts-dejavu; \
+    apt-get --no-install-recommends -y install gnupg unzip curl bash fonts-dejavu; \
     echo "networkaddress.cache.ttl=5" >> "${JAVA_HOME}/conf/security/java.security"; \
     sed --in-place --expression="s?securerandom.source=file:/dev/random?securerandom.source=file:/dev/urandom?g" "${JAVA_HOME}/conf/security/java.security"; \
     # pub   2048R/D26468DE 2015-05-25

Relevant Maintainers:

@yosifkit yosifkit merged commit 9fd3898 into docker-library:master Feb 6, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

@tianon tianon Awaiting requested review from tianon

Assignees
No one assigned
Labels
library/sonarqube
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@antoine-vigneau-sonarsource @yosifkit