diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index 377934a7..619e2aa2 100644 --- a/.cirrus/tasks.yml +++ b/.cirrus/tasks.yml @@ -16,7 +16,7 @@ env: GCLOUD_STAGING_REGISTRY: gcr.io/sonarqube-marketplace-provider GCLOUD_STAGING_PRODUCT_NAME: sonarqube-dce-staging CURRENT_LTA_VERSION: 9.9.5 - CURRENT_VERSION: 10.5.0 + CURRENT_VERSION: 10.5.1 NEXT_VERSION: 10.6.0 @@ -33,7 +33,7 @@ ci_instance_scanner: &CI_SCANNER image: platform-sq-mend-scanner-linux-v* <<: *BUILD_SERVER_HW_TEMPLATE -multi_arch_build_gcp_prod_task: +multi_arch_build_gcp_prod_task: only_if: $CIRRUS_CRON == 'nightly-mend-scan' || $TRIGGER == 'PUSH_GCP_IMAGES' ec2_instance: <<: *VM_TEMPLATE @@ -56,8 +56,8 @@ multi_arch_build_gcp_prod_task: - docker tag "${PUBLIC_IMAGE_NAME}:${CURRENT_VERSION}-datacenter-search" "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}" - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_VERSION}" - docker push "${GCLOUD_REGISTRY}/${GCLOUD_PRODUCT_NAME}/sonarqube-dce-search:${CURRENT_MINOR_VERSION}" - -multi_arch_build_gcp_staging_task: + +multi_arch_build_gcp_staging_task: only_if: $CIRRUS_CRON == 'nightly-mend-scan' || $TRIGGER == 'PUSH_GCP_STAGING_IMAGES' env: matrix: @@ -81,7 +81,7 @@ multi_arch_build_gcp_staging_task: - .cirrus/multi-arch-build.sh ${STAGING_IMAGE_NAME} $NEXT_VERSION ${version} - .cirrus/multi-arch-build.sh ${STAGING_IMAGE_NAME} $NEXT_MINOR_VERSION ${version} -multi_arch_build_task: +multi_arch_build_task: env: matrix: - version: 9/community @@ -117,7 +117,7 @@ multi_arch_build_task: - echo "Build the ${STAGING_IMAGE_NAME}:${tag} image supporting two architectures, linux/amd64 and linux/arm64" - .cirrus/multi-arch-build.sh ${STAGING_IMAGE_NAME} ${tag} ${version} -private_scan_task: +private_scan_task: env: platform: amd64 MEND_API_KEY: VAULT[development/kv/data/mend data.apikey] @@ -136,7 +136,7 @@ private_scan_task: - java -jar /usr/local/bin/wss-unified-agent.jar -c .cirrus/wss-unified-agent.config -apiKey $MEND_API_KEY -product ${WS_PRODUCTNAME} -project ${STAGING_IMAGE_NAME}:${tag} -wss.url ${WS_WSS_URL} -docker.scanImages true depends_on: multi_arch_build -public_scan_task: +public_scan_task: only_if: $CIRRUS_CRON == 'nightly-mend-scan' env: platform: amd64 diff --git a/10/community/Dockerfile b/10/community/Dockerfile index 5d06b577..8819a9cc 100644 --- a/10/community/Dockerfile +++ b/10/community/Dockerfile @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.5.0.89998 +ARG SONARQUBE_VERSION=10.5.1.90531 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile index dea8151c..ca44aca0 100644 --- a/10/datacenter/app/Dockerfile +++ b/10/datacenter/app/Dockerfile @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.5.0.89998 +ARG SONARQUBE_VERSION=10.5.1.90531 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' \ diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile index b345809d..fa6c72e4 100644 --- a/10/datacenter/search/Dockerfile +++ b/10/datacenter/search/Dockerfile @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.5.0.89998 +ARG SONARQUBE_VERSION=10.5.1.90531 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' \ diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile index 95e8c991..da1f2621 100644 --- a/10/developer/Dockerfile +++ b/10/developer/Dockerfile @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.5.0.89998 +ARG SONARQUBE_VERSION=10.5.1.90531 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' \ diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile index 560de654..1810b6cf 100644 --- a/10/enterprise/Dockerfile +++ b/10/enterprise/Dockerfile @@ -9,7 +9,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.5.0.89998 +ARG SONARQUBE_VERSION=10.5.1.90531 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' \ diff --git a/release.md b/release.md index 69f0bbd9..37a90b5a 100644 --- a/release.md +++ b/release.md @@ -10,10 +10,10 @@ Overview Release of a new version of the official SonarQube Docker images is made of several operations: 1. bump the version of SonarQube in Dockerfiles -2. bump the version of `CURRENT_LTA_VERSION` and `CURRENT_VERSION` accordingly in `.cirrus.yml` (please note that the nightly build will fail before the public image becomes available) +2. bump the version of `CURRENT_LTA_VERSION` and `CURRENT_VERSION` accordingly in `.cirrus/tasks.yml` (please note that the nightly build will fail before the public image becomes available) 3. Update the docker hub SonarQube's documentation (if applicable) 4. Update Docker Hub's SonarQube images -5. add a GIT tag for the new version +5. add a GIT tag for the new version Bump the version of SonarQube in Dockerfiles