Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit ce8f984

Browse files
authored
Upgrade sonar-scala to 7.8.0. (#17)
1 parent 1ae2971 commit ce8f984

File tree

9 files changed

+43
-28
lines changed

9 files changed

+43
-28
lines changed

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# sonar-scala-docker
22

33
[![GitHub version](https://img.shields.io/badge/release-v3.7.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
4-
[![GitHub version lts](<https://img.shields.io/badge/release_(LTS_7.9)-v4.0.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
5-
[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(LTS_6.7)-v2.12.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
4+
[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v4.1.0-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
5+
[![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)
66
[![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
77

88
Docker images and docker-compose recipes for out-of-the-box
@@ -36,7 +36,7 @@ You can also use a standalone docker image which contains SonarQube server with
3636
bundled sonar-scala plugin,
3737
[`mwizner/sonarqube-scala-plugins:3.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
3838
and
39-
[`mwizner/sonarqube-scala-plugins:4.0.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
39+
[`mwizner/sonarqube-scala-plugins:4.1.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
4040
for the current LTS version. Alternatively, we also provide an image for the old
4141
6.7 LTS version -
4242
[`mwizner/sonarqube-scala-plugins:2.12.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
@@ -85,7 +85,7 @@ scapegoat support)
8585
|Version | SonarQube | sonar-scala | sonar-scala-extra|
8686
|--------|-----------|-------------|------------------|
8787
[3.7.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.7.0) | 7.8 [documentation](https://docs.sonarqube.org/7.8), [changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14939) | [7.6.0](https://github.com/mwz/sonar-scala/releases/tag/v7.6.0)
88-
[4.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.0.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [7.7.0](https://github.com/mwz/sonar-scala/releases/tag/v7.7.0)
88+
[4.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.1.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [7.8.0](https://github.com/mwz/sonar-scala/releases/tag/v7.8.0)
8989
[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)
9090
<!-- prettier-ignore-end -->
9191

@@ -146,6 +146,12 @@ scapegoat support)
146146
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.0.0">7.0.0</td>
147147
<td></td>
148148
</tr>
149+
<tr>
150+
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.0.0">4.0.0</a></td>
151+
<td>7.9.1 LTS <a href="https://docs.sonarqube.org/7.9">documentation</a>, <a href="https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029">changelog</a></td>
152+
<td><a href="https://github.com/mwz/sonar-scala/releases/tag/v7.7.0">7.7.0</td>
153+
<td></td>
154+
</tr>
149155
<tr>
150156
<td><a href="https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.12.0">2.12.0</a></td>
151157
<td>6.7.7 LTS <a href="https://docs.sonarqube.org/display/SONARQUBE67/Documentation">documentation</a>, <a href="https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865">changelog</a></td>
@@ -242,6 +248,7 @@ way to automate analysis of Scala projects with SonarQube.
242248
<details>
243249
<summary>Expand to see the changelog.</summary>
244250
<ul>
251+
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
245252
<li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
246253
<li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>
247254
<li><strong>3.6.0</strong> - Upgraded sonar-scala to 7.5.0 & SonarQube to 7.7.</li>

README.tpl.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# sonar-scala-docker
22

33
[![GitHub version](https://img.shields.io/badge/release-v{{current.version}}-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
4-
[![GitHub version lts](<https://img.shields.io/badge/release_(LTS_7.9)-v{{lts.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
5-
[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(LTS_6.7)-v{{lts67.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
4+
[![GitHub version lts](<https://img.shields.io/badge/release_(for_SonarQube_LTS_7.9)-v{{lts.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
5+
[![GitHub version lts 6.7](<https://img.shields.io/badge/release_(for_SonarQube_LTS_6.7)-v{{lts67.version}}-blue.svg>)](https://github.com/mwz/sonarqube-scala-docker/releases)
66
[![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
77

88
Docker images and docker-compose recipes for out-of-the-box
@@ -132,6 +132,7 @@ way to automate analysis of Scala projects with SonarQube.
132132
<details>
133133
<summary>Expand to see the changelog.</summary>
134134
<ul>
135+
<li><strong>4.1.0</strong> - Upgraded sonar-scala to 7.8.0.</li>
135136
<li><strong>4.0.0</strong> - Upgraded sonar-scala to 7.7.0 & SonarQube to 7.9.1 LTS.</li>
136137
<li><strong>3.7.0</strong> - Upgraded sonar-scala to 7.6.0 & SonarQube to 7.8.</li>
137138
<li><strong>3.6.0</strong> - Upgraded sonar-scala to 7.5.0 & SonarQube to 7.7.</li>

README_DOCKERHUB.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Docker images with out-of-the-box
22
[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and
33
[SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) instance with
4-
support for [Scala](http://www.scala-lang.org),
5-
[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin) (code coverage
6-
metrics) and [Scalastyle](http://www.scalastyle.org) +
7-
[Scapegoat](https://github.com/sksamuel/scapegoat) (static code analysis).
4+
support for **[Scala](http://www.scala-lang.org)**,
5+
**[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin)** (code
6+
coverage metrics) and **[Scalastyle](http://www.scalastyle.org)** +
7+
**[Scapegoat](https://github.com/sksamuel/scapegoat)** (static code analysis).
88

99
## Available versions
1010

@@ -22,11 +22,11 @@ sonar-scala provides Scapegoat support from version `6.5.0` onwards.
2222
`3.7.0-full`
2323
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.7.0-full/Dockerfile),
2424
[Release 3.7.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.7.0)
25-
- `4.0.0` (7.9 LTS)
26-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.0.0/Dockerfile),
27-
`4.0.0-full` (7.9 LTS)
28-
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.0.0-full/Dockerfile),
29-
[Release 4.0.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.0.0)
25+
- `4.1.0` (7.9 LTS)
26+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0/Dockerfile),
27+
`4.1.0-full` (7.9 LTS)
28+
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.1.0-full/Dockerfile),
29+
[Release 4.1.0](https://github.com/mwz/sonar-scala-docker/releases/tag/4.1.0)
3030
- `2.12.0` (6.7 LTS)
3131
[Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.12.0/Dockerfile),
3232
`2.12.0-full` (6.7 LTS)
@@ -43,8 +43,8 @@ Version | SonarQube | sonar-scala |
4343
--------|-----------|-------------|
4444
3.7.0 || 7.6.0 |
4545
3.7.0-full | 7.8 | 7.6.0 |
46-
4.0.0 || 7.7.0 |
47-
4.0.0-full | 7.9.1 LTS | 7.7.0 |
46+
4.1.0 || 7.8.0 |
47+
4.1.0-full | 7.9.1 LTS | 7.8.0 |
4848
2.12.0 || 6.8.0 |
4949
2.12.0-full | 6.7.7 LTS | 6.8.0 |
5050
<!-- prettier-ignore-end -->

README_DOCKERHUB.tpl.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Docker images with out-of-the-box
22
[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and
33
[SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) instance with
4-
support for [Scala](http://www.scala-lang.org),
5-
[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin) (code coverage
6-
metrics) and [Scalastyle](http://www.scalastyle.org) +
7-
[Scapegoat](https://github.com/sksamuel/scapegoat) (static code analysis).
4+
support for **[Scala](http://www.scala-lang.org)**,
5+
**[Scoverage](https://github.com/scoverage/scalac-scoverage-plugin)** (code
6+
coverage metrics) and **[Scalastyle](http://www.scalastyle.org)** +
7+
**[Scapegoat](https://github.com/sksamuel/scapegoat)** (static code analysis).
88

99
## Available versions
1010

dev/build.sh

Lines changed: 1 addition & 1 deletion
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=7.7.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=7.9.0-SNAPSHOT
55
cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar .
66
docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .

docker-compose-lts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
depends_on:
2222
- db-lts
2323
db-lts:
24-
image: postgres:10.10-alpine
24+
image: postgres:10.11-alpine
2525
networks:
2626
- sonarnet_lts
2727
environment:
@@ -31,7 +31,7 @@ services:
3131
- postgresql_lts:/var/lib/postgresql
3232
- postgresql_lts_data:/var/lib/postgresql/data
3333
plugins-lts:
34-
image: mwizner/sonarqube-scala-plugins:4.0.0
34+
image: mwizner/sonarqube-scala-plugins:4.1.0
3535
volumes:
3636
- sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins
3737
command: /bin/true

lts/Dockerfile

Lines changed: 1 addition & 1 deletion
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 7.7.0
7+
ENV SONAR_SCALA_VERSION 7.8.0
88

99
RUN groupadd -r sonarqube && useradd -r -g sonarqube sonarqube
1010
WORKDIR /opt/sonarqube/extensions/plugins

lts/full/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM sonarqube:7.9.1-community
44

5-
ENV SONAR_SCALA_VERSION 7.7.0
5+
ENV SONAR_SCALA_VERSION 7.8.0
66

77
WORKDIR /opt/sonarqube/extensions/plugins
88
RUN rm sonar-scala-plugin-* && curl -L -o "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \

vars.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"sonarScala": "7.6.0"
88
},
99
"lts": {
10-
"version": "4.0.0",
10+
"version": "4.1.0",
1111
"sonar": "7.9.1 LTS",
1212
"sonarDocs": "https://docs.sonarqube.org/7.9",
1313
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
14-
"sonarScala": "7.7.0"
14+
"sonarScala": "7.8.0"
1515
},
1616
"lts67": {
1717
"version": "2.12.0",
@@ -80,6 +80,13 @@
8080
}
8181
],
8282
"lts": [
83+
{
84+
"version": "4.0.0",
85+
"sonar": "7.9.1 LTS",
86+
"sonarDocs": "https://docs.sonarqube.org/7.9",
87+
"sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029",
88+
"sonarScala": "7.7.0"
89+
},
8390
{
8491
"version": "2.12.0",
8592
"sonar": "6.7.7 LTS",

0 commit comments

Comments
 (0)