Skip to content

Commit

Permalink
[#118] SonarQube 9.9.8 upgrade:
Browse files Browse the repository at this point in the history
- Added directory creation for trivy output in Dockerfile
- Update Java Base Image to 17.0.13-1
- Update cas plugin to 5.1.0
- Update cas plugin version in goss to sonar-cas-plugin-5.1.0.jar
- Update SonarQube to 9.9.8.100196
- Adjusted changelog and release notes
  • Loading branch information
dnschwarzer committed Jan 10, 2025
1 parent 4b6d696 commit 664b987
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
- [#118] Added directory creation for trivy output in Dockerfile
- [#118] Update cas plugin version in goss to sonar-cas-plugin-5.1.0.jar
- [#118] Update cas plugin to 5.1.0
- [#118] Update SonarQube to 9.9.8.100196
- [#118] Update Java Base Image to 17.0.13-1
- [#118] Update SonarQube to 9.9.8.100196
- [#116] Update Makefiles to 9.5.0

## [v9.9.7-1] - 2024-11-04
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM registry.cloudogu.com/official/java:17.0.12-3 as base
FROM registry.cloudogu.com/official/java:17.0.13-1 as base

ENV SONARQUBE_HOME=/opt/sonar \
# mark as webapp for nginx
SERVICE_TAGS=webapp \
SONAR_VERSION=9.9.7.96285 \
CAS_PLUGIN_VERSION=5.0.2 \
SONAR_VERSION=9.9.8.100196 \
CAS_PLUGIN_VERSION=5.1.0 \
STARTUP_DIR="/"

FROM base as builder

ENV SONARQUBE_ZIP_SHA256=82eb93a1380dac4725ad24fd94a11917fb2e0ac6b9a9c98b20e436ed2a50f351 \
CAS_PLUGIN_JAR_SHA256=82f9fd7f65c9ce255f4f1dd6649a65a1f7eaf2acbc6a54f2c8103cbc2a42010f \
ENV SONARQUBE_ZIP_SHA256=07d9100c95e5c19f1785c0e9ffc7c8973ce3069a568d2500146a5111b6e966cd \
CAS_PLUGIN_JAR_SHA256=67a127a4f8fd247b2f2c84869d62d960c97fb546083a79fbac637163123490a2 \
BUILDER_HOME="/builder/sonar"

WORKDIR /builder
Expand All @@ -27,7 +27,7 @@ RUN echo "${CAS_PLUGIN_JAR_SHA256} *${BUILDER_HOME}/sonar-cas-plugin-${CAS_PLUGI
FROM base

LABEL NAME="official/sonar" \
VERSION="9.9.7-1" \
VERSION="9.9.8-1" \
maintainer="[email protected]"

RUN set -eux \
Expand All @@ -43,6 +43,7 @@ RUN set -eux \

COPY --from=builder --chown=1000:1000 /builder/sonar ${SONARQUBE_HOME}
COPY --chown=1000:1000 ./resources /
RUN mkdir -p /trivy/output

EXPOSE 9000

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!groovy
@Library(['github.com/cloudogu/ces-build-lib@2.4.0', 'github.com/cloudogu/dogu-build-lib@v2.5.0'])
@Library(['github.com/cloudogu/ces-build-lib@3.1.0', 'github.com/cloudogu/dogu-build-lib-test@urltest'])
import com.cloudogu.ces.cesbuildlib.*
import com.cloudogu.ces.dogubuildlib.*

Expand Down
2 changes: 2 additions & 0 deletions docs/gui/release_notes_de.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Im Folgenden finden Sie die Release Notes für das SonarQube-Dogu.
Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/sonar/CHANGELOG/).

## [Unreleased]
* Das Dogu bietet nun die SonarQube-Version 9.9.8 an. Die Release Notes von SonarQube finden Sie [hier](https://docs.sonarsource.com/sonarqube/latest/setup-and-upgrade/release-upgrade-notes/#release-9.9-upgrade-notes).
Eine Liste der im aktuellen Patch-release enthaltenen Verbesserungen findet sich [hier](https://sonarsource.atlassian.net/issues/?jql=project%20%3D%2010139%20AND%20fixVersion%20%3D%2016011%20AND%20issuetype%20%21%3D%20Task)

## 9.9.7-1
* Das Dogu bietet nun die SonarQube-Version 9.9.7 an. Die Release Notes von SonarQube finden Sie [hier](https://docs.sonarsource.com/sonarqube/latest/setup-and-upgrade/release-upgrade-notes/#release-9.9-upgrade-notes).
Expand Down
2 changes: 2 additions & 0 deletions docs/gui/release_notes_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Below you will find the release notes for the SonarQube Dogu.
Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/sonar/CHANGELOG/).

## [Unreleased]
* The Dogu now offers SonarQube version 9.9.8. The SonarQube release notes can be found [here](https://docs.sonarsource.com/sonarqube/latest/setup-and-upgrade/release-upgrade-notes/#release-9.9-upgrade-notes).
A list of the improvements included in the current patch release can be found [here](https://sonarsource.atlassian.net/issues/?jql=project%20%3D%2010139%20AND%20fixVersion%20%3D%2016011%20AND%20issuetype%20%21%3D%20Task)

## 9.9.7-1
* The Dogu now offers SonarQube version 9.9.7. The SonarQube release notes can be found [here](https://docs.sonarsource.com/sonarqube/latest/setup-and-upgrade/release-upgrade-notes/#release-9.9-upgrade-notes).
Expand Down
2 changes: 1 addition & 1 deletion spec/goss/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ file:
group: sonar
filetype: file
contains: []
/opt/sonar/extensions/plugins/sonar-cas-plugin-5.0.2.jar:
/opt/sonar/extensions/plugins/sonar-cas-plugin-5.1.0.jar:
exists: true
filetype: file
contains: []
Expand Down

0 comments on commit 664b987

Please sign in to comment.