Upgrade SonarQube to 10.0 #14371
Merged
Upgrade SonarQube to 10.0 #14371
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carminevassallo
changed the title
carminevassallo
changed the title
This comment has been minimized.
This comment has been minimized.
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/sonar-scanner-cli-dockerSeems fine to add a label:+1:. Should this be pointing to One caveat of using a label is that they are inherited by images |
|
See also #3540 (comment), especially:
(for further context/consideration, not because it's necessarily a blocker) |
Thanks for spotting this guys! We are gonna fix it shortly... |
and that's fixed. Please let us know if you have other comments, otherwise feel free to merge :) |
Diff for c1c2ff5:diff --git a/_bashbrew-cat b/_bashbrew-cat
index a42c6ae..696546e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,19 +1,34 @@
-Maintainers: Christophe Levis <christophe.levis@sonarsource.com> (@christophelevis), Pierre Guillot <pierre.guillot@sonarsource.com> (@pierre-guillot-gh), Lukasz Jarocki <lukasz.jarocki@sonarsource.com> (@lukasz-jarocki-sonarsource), Aurelien Poscia <aurelien.poscia@sonarsource.com> (@aurelien-poscia-sonarsource), Carmine Vassallo <carmine.vassallo@sonarsource.com> (@carminevassallo), Jeremy Cotineau <jeremy.cotineau@sonarsource.com> (@jCOTINEAU)
+Maintainers: Carmine Vassallo <carmine.vassallo@sonarsource.com> (@carminevassallo), Jeremy Cotineau <jeremy.cotineau@sonarsource.com> (@jCOTINEAU)
Architectures: amd64, arm64v8
GitRepo: https://github.com/SonarSource/docker-sonarqube.git
-GitCommit: ed2071a47632c34d7639b6ad1b393ab2aee1c9a8
+GitCommit: 711096a093a224d37da8901d5fdb350adf455daa
-Tags: 9.9.0-community, 9.9-community, 9-community, community, lts, lts-community, latest
+Tags: 9.9.0-community, 9.9-community, 9-community, lts, lts-community
Directory: 9/community
-Tags: 9.9.0-datacenter-app, 9.9-datacenter-app, 9-datacenter-app, datacenter-app, lts-datacenter-app
+Tags: 9.9.0-datacenter-app, 9.9-datacenter-app, 9-datacenter-app, lts-datacenter-app
Directory: 9/datacenter/app
-Tags: 9.9.0-datacenter-search, 9.9-datacenter-search, 9-datacenter-search, datacenter-search, lts-datacenter-search
+Tags: 9.9.0-datacenter-search, 9.9-datacenter-search, 9-datacenter-search, lts-datacenter-search
Directory: 9/datacenter/search
-Tags: 9.9.0-developer, 9.9-developer, 9-developer, developer, lts-developer
+Tags: 9.9.0-developer, 9.9-developer, 9-developer, lts-developer
Directory: 9/developer
-Tags: 9.9.0-enterprise, 9.9-enterprise, 9-enterprise, enterprise, lts-enterprise
+Tags: 9.9.0-enterprise, 9.9-enterprise, 9-enterprise, lts-enterprise
Directory: 9/enterprise
+
+Tags: 10.0.0-community, 10.0-community, 10-community, community, latest
+Directory: 10/community
+
+Tags: 10.0.0-datacenter-app, 10.0-datacenter-app, 10-datacenter-app, datacenter-app
+Directory: 10/datacenter/app
+
+Tags: 10.0.0-datacenter-search, 10.0-datacenter-search, 10-datacenter-search, datacenter-search
+Directory: 10/datacenter/search
+
+Tags: 10.0.0-developer, 10.0-developer, 10-developer, developer
+Directory: 10/developer
+
+Tags: 10.0.0-enterprise, 10.0-enterprise, 10-enterprise, enterprise
+Directory: 10/enterprise
diff --git a/_bashbrew-list b/_bashbrew-list
index a81b137..d1458ef 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -13,6 +13,21 @@ sonarqube:9.9.0-datacenter-app
sonarqube:9.9.0-datacenter-search
sonarqube:9.9.0-developer
sonarqube:9.9.0-enterprise
+sonarqube:10-community
+sonarqube:10-datacenter-app
+sonarqube:10-datacenter-search
+sonarqube:10-developer
+sonarqube:10-enterprise
+sonarqube:10.0-community
+sonarqube:10.0-datacenter-app
+sonarqube:10.0-datacenter-search
+sonarqube:10.0-developer
+sonarqube:10.0-enterprise
+sonarqube:10.0.0-community
+sonarqube:10.0.0-datacenter-app
+sonarqube:10.0.0-datacenter-search
+sonarqube:10.0.0-developer
+sonarqube:10.0.0-enterprise
sonarqube:community
sonarqube:datacenter-app
sonarqube:datacenter-search
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6e880be..66542d7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,10 @@
-sonarqube:latest
+sonarqube:lts-community
sonarqube:lts-datacenter-app
sonarqube:lts-datacenter-search
sonarqube:lts-developer
sonarqube:lts-enterprise
+sonarqube:latest
+sonarqube:datacenter-app
+sonarqube:datacenter-search
+sonarqube:developer
+sonarqube:enterprise
diff --git a/sonarqube_lts-datacenter-app/Dockerfile b/sonarqube_datacenter-app/Dockerfile
similarity index 95%
copy from sonarqube_lts-datacenter-app/Dockerfile
copy to sonarqube_datacenter-app/Dockerfile
index d7d8013..cd1f8cd 100644
--- a/sonarqube_lts-datacenter-app/Dockerfile
+++ b/sonarqube_datacenter-app/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
@@ -7,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.9.0.65466
+ARG SONARQUBE_VERSION=10.0.0.68432
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME='/opt/java/openjdk' \
SONARQUBE_HOME=/opt/sonarqube \
diff --git a/sonarqube_lts-datacenter-app/run.sh b/sonarqube_datacenter-app/run.sh
similarity index 100%
copy from sonarqube_lts-datacenter-app/run.sh
copy to sonarqube_datacenter-app/run.sh
diff --git a/sonarqube_lts-datacenter-app/sonar.sh b/sonarqube_datacenter-app/sonar.sh
similarity index 100%
copy from sonarqube_lts-datacenter-app/sonar.sh
copy to sonarqube_datacenter-app/sonar.sh
diff --git a/sonarqube_lts-datacenter-search/Dockerfile b/sonarqube_datacenter-search/Dockerfile
similarity index 95%
copy from sonarqube_lts-datacenter-search/Dockerfile
copy to sonarqube_datacenter-search/Dockerfile
index 83e7a1f..27aac03 100644
--- a/sonarqube_lts-datacenter-search/Dockerfile
+++ b/sonarqube_datacenter-search/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
@@ -7,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.9.0.65466
+ARG SONARQUBE_VERSION=10.0.0.68432
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME='/opt/java/openjdk' \
SONARQUBE_HOME=/opt/sonarqube \
diff --git a/sonarqube_lts-datacenter-search/run.sh b/sonarqube_datacenter-search/run.sh
similarity index 100%
copy from sonarqube_lts-datacenter-search/run.sh
copy to sonarqube_datacenter-search/run.sh
diff --git a/sonarqube_lts-datacenter-app/sonar.sh b/sonarqube_datacenter-search/sonar.sh
similarity index 100%
copy from sonarqube_lts-datacenter-app/sonar.sh
copy to sonarqube_datacenter-search/sonar.sh
diff --git a/sonarqube_lts-developer/Dockerfile b/sonarqube_developer/Dockerfile
similarity index 95%
copy from sonarqube_lts-developer/Dockerfile
copy to sonarqube_developer/Dockerfile
index ba87516..3d7747f 100644
--- a/sonarqube_lts-developer/Dockerfile
+++ b/sonarqube_developer/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
@@ -7,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.9.0.65466
+ARG SONARQUBE_VERSION=10.0.0.68432
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME='/opt/java/openjdk' \
SONARQUBE_HOME=/opt/sonarqube \
diff --git a/sonarqube_latest/entrypoint.sh b/sonarqube_developer/entrypoint.sh
similarity index 100%
copy from sonarqube_latest/entrypoint.sh
copy to sonarqube_developer/entrypoint.sh
diff --git a/sonarqube_lts-enterprise/Dockerfile b/sonarqube_enterprise/Dockerfile
similarity index 95%
copy from sonarqube_lts-enterprise/Dockerfile
copy to sonarqube_enterprise/Dockerfile
index 7d15b96..a04a0d6 100644
--- a/sonarqube_lts-enterprise/Dockerfile
+++ b/sonarqube_enterprise/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
@@ -7,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.9.0.65466
+ARG SONARQUBE_VERSION=10.0.0.68432
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME='/opt/java/openjdk' \
SONARQUBE_HOME=/opt/sonarqube \
diff --git a/sonarqube_latest/entrypoint.sh b/sonarqube_enterprise/entrypoint.sh
similarity index 100%
copy from sonarqube_latest/entrypoint.sh
copy to sonarqube_enterprise/entrypoint.sh
diff --git a/sonarqube_latest/Dockerfile b/sonarqube_latest/Dockerfile
index 12b4838..1cebacd 100644
--- a/sonarqube_latest/Dockerfile
+++ b/sonarqube_latest/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
@@ -7,7 +9,7 @@ ENV LANG='en_US.UTF-8' \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.9.0.65466
+ARG SONARQUBE_VERSION=10.0.0.68432
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME='/opt/java/openjdk' \
SONARQUBE_HOME=/opt/sonarqube \
diff --git a/sonarqube_latest/Dockerfile b/sonarqube_lts-community/Dockerfile
similarity index 96%
copy from sonarqube_latest/Dockerfile
copy to sonarqube_lts-community/Dockerfile
index 12b4838..7a3dab1 100644
--- a/sonarqube_latest/Dockerfile
+++ b/sonarqube_lts-community/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
diff --git a/sonarqube_latest/entrypoint.sh b/sonarqube_lts-community/entrypoint.sh
similarity index 100%
copy from sonarqube_latest/entrypoint.sh
copy to sonarqube_lts-community/entrypoint.sh
diff --git a/sonarqube_lts-datacenter-app/Dockerfile b/sonarqube_lts-datacenter-app/Dockerfile
index d7d8013..4c52bf1 100644
--- a/sonarqube_lts-datacenter-app/Dockerfile
+++ b/sonarqube_lts-datacenter-app/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
diff --git a/sonarqube_lts-datacenter-search/Dockerfile b/sonarqube_lts-datacenter-search/Dockerfile
index 83e7a1f..6f9f354 100644
--- a/sonarqube_lts-datacenter-search/Dockerfile
+++ b/sonarqube_lts-datacenter-search/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
diff --git a/sonarqube_lts-developer/Dockerfile b/sonarqube_lts-developer/Dockerfile
index ba87516..6f5b49a 100644
--- a/sonarqube_lts-developer/Dockerfile
+++ b/sonarqube_lts-developer/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
diff --git a/sonarqube_lts-enterprise/Dockerfile b/sonarqube_lts-enterprise/Dockerfile
index 7d15b96..884c243 100644
--- a/sonarqube_lts-enterprise/Dockerfile
+++ b/sonarqube_lts-enterprise/Dockerfile
@@ -1,5 +1,7 @@
FROM eclipse-temurin:17-jre
+LABEL org.opencontainers.image.url=https://github.com/SonarSource/docker-sonarqube
+
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dear team,
we just released SonarQube 10.0. Please merge this PR to have it released as Docker image.