Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit a78df75

Browse filesBrowse files
mwzmwz
authored
Upgrade SonarQube to 9.4 & sonar-scala to 9.0.0 (#33)
1 parent 978202f commit a78df75
Copy full SHA for a78df75

10 files changed

+60
-40
lines changed

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
.idea
23
.metals
34
.vscode

‎README.md

Copy file name to clipboardExpand all lines: README.md
+14-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# sonar-scala-docker
22

3-
[![GitHub version](<https://img.shields.io/badge/release_(for_SonarQube_8.7.1)-v5.7.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
3+
[![GitHub version](<https://img.shields.io/badge/release_(for_SonarQube_9.4.0)-v6.0.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
44
[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_8.9)-v5.8.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
55
[![GitHub version lts 7.9](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v4.2.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
66
[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(for_SonarQube_LTS_6.7)-v2.12.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
77
[![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
88

99
Docker images and docker-compose recipes for out-of-the-box
10-
[SonarQube 8.7.1](https://www.sonarqube.org),
10+
[SonarQube 9.4.0](https://www.sonarqube.org),
1111
[SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-9-lts),
1212
[SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) and
1313
[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) instance with
@@ -37,7 +37,7 @@ default SonarQube login details for the Administrator account are `admin:admin`.
3737

3838
You can also use a standalone docker image which contains SonarQube server with
3939
bundled sonar-scala plugin,
40-
[`mwizner/sonarqube-scala-plugins:5.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or
40+
[`mwizner/sonarqube-scala-plugins:6.0.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or
4141
`mwizner/sonarqube-scala-plugins:latest-full`) and
4242
[`mwizner/sonarqube-scala-plugins:5.8.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
4343
(or `mwizner/sonarqube-scala-plugins:latest-lts-full`) for the current LTS
@@ -58,7 +58,7 @@ docker run -d \
5858
-e SONARQUBE_JDBC_USERNAME=sonar \
5959
-e SONARQUBE_JDBC_PASSWORD=sonar \
6060
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
61-
mwizner/sonarqube-scala-plugins:5.7.0-full
61+
mwizner/sonarqube-scala-plugins:6.0.0-full
6262
```
6363

6464
Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable,
@@ -70,16 +70,16 @@ want to try the image, you can use the following command:
7070
docker run -d \
7171
--name sonarqube-scala-plugins-full \
7272
-p 80:9000 \
73-
mwizner/sonarqube-scala-plugins:5.7.0-full
73+
mwizner/sonarqube-scala-plugins:6.0.0-full
7474
```
7575

7676
## Dependencies
7777

78-
- [SonarQube 8.7.1](https://hub.docker.com/_/sonarqube) or
78+
- [SonarQube 9.4.0](https://hub.docker.com/_/sonarqube) or
7979
[SonarQube 8.9 LTS](https://hub.docker.com/_/sonarqube) or
8080
[SonarQube 7.9 LTS](https://hub.docker.com/_/sonarqube) or
8181
[SonarQube 6.7 LTS](https://hub.docker.com/_/sonarqube)
82-
- [PostgreSQL 12](https://hub.docker.com/_/postgres)
82+
- [PostgreSQL 12/13](https://hub.docker.com/_/postgres)
8383
- [mwz/sonar-scala](https://github.com/mwz/sonar-scala) - provides support for
8484
scalastyle, scoverage and scapegoat
8585

@@ -92,7 +92,7 @@ scapegoat support)_
9292
<!-- prettier-ignore-start -->
9393
|Version | SonarQube | sonar-scala |
9494
|--------|-----------|-------------|
95-
[5.7.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.7.0) | 8.7.1 [documentation](https://docs.sonarqube.org/8.7), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=16540) | [8.7.0](https://github.com/mwz/sonar-scala/releases/tag/v8.7.0)
95+
[6.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/6.0.0) | 9.4.0 [documentation](https://docs.sonarqube.org/9.4), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=17167) | [9.0.0](https://github.com/mwz/sonar-scala/releases/tag/v9.0.0)
9696
[5.8.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.8.0) | 8.9.4 LTS [documentation](https://docs.sonarqube.org/8.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=17027) | [8.9.0](https://github.com/mwz/sonar-scala/releases/tag/v8.9.0)
9797
[4.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.2.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [8.9.0](https://github.com/mwz/sonar-scala/releases/tag/v7.9.0)
9898
[2.12.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.12.0) | 6.7.7 LTS [documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation), [changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865) | [6.8.0](https://github.com/mwz/sonar-scala/releases/tag/v6.8.0)
@@ -107,6 +107,12 @@ scapegoat support)_
107107
<td><b>sonar-scala</b></td>
108108
<td><b>sonar-scala-extra</b></td>
109109
</tr>
110+
<tr>
111+
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.7.0">5.7.0</a></td>
112+
<td>8.7.1 <a href="https://docs.sonarqube.org/8.7">documentation</a>, <a href="https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=16540">changelog</a></td>
113+
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v8.7.0">8.7.0</td>
114+
<td></td>
115+
</tr>
110116
<tr>
111117
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.6.0">5.6.0</a></td>
112118
<td>8.5.1 <a href="https://docs.sonarqube.org/8.5">documentation</a>, <a href="https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=16342">changelog</a></td>

‎README.tpl.md

Copy file name to clipboardExpand all lines: README.tpl.md
+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ docker run -d \
7979
[SonarQube 8.9 LTS](https://hub.docker.com/_/sonarqube) or
8080
[SonarQube 7.9 LTS](https://hub.docker.com/_/sonarqube) or
8181
[SonarQube 6.7 LTS](https://hub.docker.com/_/sonarqube)
82-
- [PostgreSQL 12](https://hub.docker.com/_/postgres)
82+
- [PostgreSQL 12/13](https://hub.docker.com/_/postgres)
8383
- [mwz/sonar-scala](https://github.com/mwz/sonar-scala) - provides support for
8484
scalastyle, scoverage and scapegoat
8585

‎README_DOCKERHUB.md

Copy file name to clipboardExpand all lines: README_DOCKERHUB.md
+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Docker images with out-of-the-box
2-
[SonarQube 8.7.1](https://www.sonarqube.org),
2+
[SonarQube 9.4.0](https://www.sonarqube.org),
33
[SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-9-lts),
44
[SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) and
55
[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) instance with
@@ -19,11 +19,11 @@ Starting from version `2.7.0`, the images no longer contain the
1919
[sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugin as
2020
sonar-scala provides Scapegoat support from version `6.5.0` onwards.
2121

22-
- `5.7.0`, `latest`
23-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.7.0/Dockerfile),
24-
`5.7.0-full`, `latest-full`
25-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.7.0-full/Dockerfile),
26-
[Release 5.7.0](https://github.com/mwz/sonar-scala-docker/releases/tag/5.7.0)
22+
- `6.0.0`, `latest`
23+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/6.0.0/Dockerfile),
24+
`6.0.0-full`, `latest-full`
25+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/6.0.0-full/Dockerfile),
26+
[Release 6.0.0](https://github.com/mwz/sonar-scala-docker/releases/tag/6.0.0)
2727
- `5.8.0`, `latest-lts` (8.9 LTS)
2828
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.8.0/Dockerfile),
2929
`5.8.0-full`, `latest-lts-full` (8.9 LTS)
@@ -47,8 +47,8 @@ For older versions please check the
4747

4848
| Version | SonarQube | sonar-scala |
4949
| ------------------------ | ----------------- | ---------------------- |
50-
| 5.7.0 | | 8.7.0 |
51-
| 5.7.0-full | 8.7.1 | 8.7.0 |
50+
| 6.0.0 | | 9.0.0 |
51+
| 6.0.0-full | 9.4.0 | 9.0.0 |
5252
| 5.8.0 | | 8.9.0 |
5353
| 5.8.0-full | 8.9.4 LTS | 8.9.0 |
5454
| 4.2.0 | | 7.9.0 |
@@ -66,7 +66,7 @@ version: "2"
6666
6767
services:
6868
sonarqube:
69-
image: sonarqube:8.7.1-community
69+
image: sonarqube:9.4.0-community
7070
ports:
7171
- "80:9000"
7272
networks:
@@ -75,7 +75,7 @@ services:
7575
- plugins
7676
7777
plugins:
78-
image: mwizner/sonarqube-scala-plugins:5.7.0
78+
image: mwizner/sonarqube-scala-plugins:6.0.0
7979
volumes:
8080
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
8181
command: /bin/true
@@ -103,7 +103,7 @@ docker run -d \
103103
-e SONARQUBE_JDBC_USERNAME=sonar \
104104
-e SONARQUBE_JDBC_PASSWORD=sonar \
105105
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
106-
mwizner/sonarqube-scala-plugins:5.7.0-full
106+
mwizner/sonarqube-scala-plugins:6.0.0-full
107107
```
108108

109109
Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable,
@@ -115,7 +115,7 @@ want to try the image, you can use the following command:
115115
docker run -d \
116116
--name sonarqube-scala-plugins-full \
117117
-p 80:9000 \
118-
mwizner/sonarqube-scala-plugins:5.7.0-full
118+
mwizner/sonarqube-scala-plugins:6.0.0-full
119119
```
120120

121121
## Repository

‎conf/sonar.properties

Copy file name to clipboardExpand all lines: conf/sonar.properties
+13-7
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
# H2 embedded database server listening port, defaults to 9092
2323
#sonar.embeddedDatabase.port=9092
2424

25-
#----- Oracle 11g/12c/18c/19c
25+
#----- Oracle 12c/18c/19c
2626
# The Oracle JDBC driver must be copied into the directory extensions/jdbc-driver/oracle/.
2727
# Only the thin client is supported, and we recommend using the latest Oracle JDBC driver. See
2828
# https://jira.sonarsource.com/browse/SONAR-9758 for more details.
2929
# If you need to set the schema, please refer to http://jira.sonarsource.com/browse/SONAR-5000
3030
#sonar.jdbc.url=jdbc:oracle:thin:@localhost:1521/XE
3131

32-
#----- PostgreSQL 9.3 or greater
32+
#----- PostgreSQL 9.6 or greater
3333
# By default the schema named "public" is used. It can be overridden with the parameter "currentSchema".
3434
#sonar.jdbc.url=jdbc:postgresql://localhost/sonarqube?currentSchema=my_schema
3535

36-
#----- Microsoft SQLServer 2014/2016/2017 and SQL Azure
36+
#----- Microsoft SQLServer 2014/2016/2017/2019 and SQL Azure
3737
# A database named sonar must exist and its collation must be case-sensitive (CS) and accent-sensitive (AS)
3838
# Use the following connection string if you want to use integrated security with Microsoft Sql Server
3939
# Do not set sonar.jdbc.username or sonar.jdbc.password property if you are using Integrated Security
40-
# For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.2.0 package from
41-
# https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#92
42-
# and copy mssql-jdbc_auth-9.2.0.x64.dll to your path.
40+
# For Integrated Security to work, you have to download the Microsoft SQL JDBC Driver 9.4.1 package from
41+
# https://docs.microsoft.com/en-us/sql/connect/jdbc/release-notes-for-the-jdbc-driver?view=sql-server-ver15#94
42+
# and copy mssql-jdbc_auth-9.4.1.x64.dll to your path.
4343
#sonar.jdbc.url=jdbc:sqlserver://localhost;databaseName=sonar;integratedSecurity=true
4444

4545
# Use the following connection string if you want to use SQL Auth while connecting to MS Sql Server.
@@ -114,6 +114,12 @@
114114
# The default value is 25.
115115
#sonar.web.http.acceptCount=25
116116

117+
# The number of milliseconds this Connector will wait for another HTTP request before closing the
118+
# connection. The default value is to use the value that has been set for the connectionTimeout
119+
# attribute. Use a value of -1 to indicate no (i.e. infinite) timeout.
120+
# The default value is 60000 (ms).
121+
#sonar.web.http.keepAliveTimeout=60000
122+
117123
# By default users are logged out and sessions closed when server is restarted.
118124
# If you prefer keeping user sessions open, a secret should be defined. Value is
119125
# HS256 key encoded with base64. It must be unique for each installation of SonarQube.
@@ -124,7 +130,7 @@
124130
# The inactivity timeout duration of user sessions, in minutes. After the configured
125131
# period of time, the user is logged out.
126132
# The default value is set to 3 days (4320 minutes).
127-
# It must be set between 5 minutes and 3 months.
133+
# It must be set between 6 minutes and 3 months (129600 minutes).
128134
# Value must be strictly positive.
129135
#sonar.web.sessionTimeoutInMinutes=4320
130136

‎current/Dockerfile

Copy file name to clipboardExpand all lines: current/Dockerfile
+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
FROM bitnami/minideb:stretch
55
RUN install_packages curl ca-certificates
66

7-
ENV SONAR_SCALA_VERSION 8.7.0
7+
ENV SONAR_SCALA_VERSION 9.0.0
88
ENV SQ_EXTENSIONS_DIR "/opt/sonarqube/extensions"
99

1010
RUN groupadd -g 1000 -r sonarqube && useradd -r -g sonarqube sonarqube

‎current/full/Dockerfile

Copy file name to clipboardExpand all lines: current/full/Dockerfile
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# SonarQube 8.7 image with bundled sonar-scala (https://github.com/mwz/sonar-scala).
1+
# SonarQube 9.4 image with bundled sonar-scala (https://github.com/mwz/sonar-scala).
22

3-
FROM sonarqube:8.7.1-community
3+
FROM sonarqube:9.4.0-community
44

5-
ENV SONAR_SCALA_VERSION 8.7.0
5+
ENV SONAR_SCALA_VERSION 9.0.0
66

77
RUN rm $SONARQUBE_HOME/lib/extensions/sonar-scala* && \
88
wget -O "${SQ_EXTENSIONS_DIR}/plugins/sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \

‎dev/build.sh

Copy file name to clipboard
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -eu
33

4-
export SONAR_SCALA_VERSION=8.7.0+21-736a5867+20211215-1535-SNAPSHOT
4+
export SONAR_SCALA_VERSION=8.9.0+5-1ab816ae-SNAPSHOT
55
cp ~/.ivy2/local/com.sonar-scala/sonar-scala_2.13/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.13-assembly.jar .
66
docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .

‎docker-compose.yml

Copy file name to clipboardExpand all lines: docker-compose.yml
+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
sonarqube:
5-
image: sonarqube:8.7.1-community
5+
image: sonarqube:9.4.0-community
66
ports:
77
- "80:9000"
88
networks:
@@ -22,7 +22,7 @@ services:
2222
- db
2323
entrypoint: ["bash", "-c", "rm lib/extensions/sonar-scala*; bin/run.sh"]
2424
db:
25-
image: postgres:12.6-alpine
25+
image: postgres:13-alpine
2626
networks:
2727
- sonarnet
2828
environment:

‎vars.json

Copy file name to clipboardExpand all lines: vars.json
+12-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"current": {
3-
"version": "5.7.0",
4-
"sonar": "8.7.1",
5-
"sonarDocs": "https://docs.sonarqube.org/8.7",
6-
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=16540",
7-
"sonarScala": "8.7.0"
3+
"version": "6.0.0",
4+
"sonar": "9.4.0",
5+
"sonarDocs": "https://docs.sonarqube.org/9.4",
6+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=17167",
7+
"sonarScala": "9.0.0"
88
},
99
"lts": {
1010
"version": "5.8.0",
@@ -29,6 +29,13 @@
2929
},
3030
"versions": {
3131
"current": [
32+
{
33+
"version": "5.7.0",
34+
"sonar": "8.7.1",
35+
"sonarDocs": "https://docs.sonarqube.org/8.7",
36+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=16540",
37+
"sonarScala": "8.7.0"
38+
},
3239
{
3340
"version": "5.6.0",
3441
"sonar": "8.5.1",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.