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

Commit 1b3a6c1

Browse files
mwzmwz
committed
Upgrade sonar-scala to 6.3.0.
1 parent 2c8fde9 commit 1b3a6c1

File tree

7 files changed

+57
-4
lines changed

7 files changed

+57
-4
lines changed

‎2.4.0-full/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# SonarQube 6.7.3 LTS image with bundled Scala plugins
2+
# sonar-scala 6.3.0 (https://github.com/mwz/sonar-scala)
3+
# and sonar-scala-extra 1.3.0 (https://github.com/arthepsy/sonar-scala-extra).
4+
5+
FROM sonarqube:6.7.3-alpine
6+
7+
ENV SONAR_SCAPEGOAT_VERSION 1.3.0
8+
ENV SONAR_SCALA_VERSION 6.3.0
9+
10+
WORKDIR /opt/sonarqube/extensions/plugins
11+
RUN wget -O "sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar" \
12+
"https://github.com/arthepsy/sonar-scala-extra/releases/download/v${SONAR_SCAPEGOAT_VERSION}/sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar"
13+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
14+
"https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/sonar-scala_2.12-${SONAR_SCALA_VERSION}-assembly.jar"
15+
16+
WORKDIR $SONARQUBE_HOME
17+
ENTRYPOINT ["./bin/run.sh"]

‎2.4.0/Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Alpine image with bundled Scala plugins
2+
# sonar-scala 6.3.0 (https://github.com/mwz/sonar-scala)
3+
# and sonar-scala-extra 1.3.0 (https://github.com/arthepsy/sonar-scala-extra),
4+
# which can be mounted as a volume into a SonarQube container.
5+
6+
FROM alpine:3.7
7+
8+
ENV SONAR_SCAPEGOAT_VERSION 1.3.0
9+
ENV SONAR_SCALA_VERSION 6.3.0
10+
11+
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
12+
13+
WORKDIR /opt/sonarqube/extensions/plugins
14+
RUN wget -O "sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar" \
15+
"https://github.com/arthepsy/sonar-scala-extra/releases/download/v${SONAR_SCAPEGOAT_VERSION}/sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar"
16+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
17+
"https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/sonar-scala_2.12-${SONAR_SCALA_VERSION}-assembly.jar"

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, SonarQu
3838
## Compatibility Matrix
3939
Version | SonarQube | sonar-scala | sonar-scala-extra
4040
--------|-----------|-------------|------------------
41+
[2.4.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.4.0) | 6.7.3 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14264)) | [6.3.0](https://github.com/mwz/sonar-scala/releases/tag/v6.3.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
4142
[2.3.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.3.0) | 6.7.3 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14264)) | [6.2.0](https://github.com/mwz/sonar-scala/releases/tag/v6.2.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
4243
[2.2.1](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.2.1) | 6.7.3 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14264)) | [6.1.0](https://github.com/mwz/sonar-scala/releases/tag/v6.1.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
4344
[2.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.2.0) | 6.7.2 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14191)) | [6.1.0](https://github.com/mwz/sonar-scala/releases/tag/v6.1.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
@@ -49,6 +50,7 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
4950
[sbt-sonar](https://github.com/mwz/sbt-sonar) is an sbt plugin which provides a way to automate analysis of Scala projects with SonarQube.
5051

5152
## Changelog
53+
- **2.4.0** - Upgraded sonar-scala to 6.3.0.
5254
- **2.3.0** - Upgraded sonar-scala to 6.2.0.
5355
- **2.2.1** - Upgraded SonarQube to 6.7.3 LTS.
5456
- **2.2.0** - Upgraded sonar-scala to 6.1.0 & SonarQube to 6.7.2 LTS.

‎README_DOCKERHUB.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Docker images with out-of-the-box [SonarQube LTS](https://www.sonarqube.org) ins
44

55
There are two types of images available: images with [sonar-scala](https://github.com/mwz/sonar-scala) and [sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugins, which can be mounted as a volume into a SonarQube container and images which bundle those plugins with SonarQube (suffixed with `-full`).
66

7+
- `2.4.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.4.0/Dockerfile), [(v2.4.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.4.0)
8+
- `2.4.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.4.0-full/Dockerfile), [(v2.4.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.4.0)
79
- `2.3.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.3.0/Dockerfile), [(v2.3.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.3.0)
810
- `2.3.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.3.0-full/Dockerfile), [(v2.3.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.3.0)
911
- `2.2.1`, [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.2.1/Dockerfile), [(v2.2.1)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.2.1)
@@ -16,6 +18,8 @@ There are two types of images available: images with [sonar-scala](https://githu
1618
## What's included
1719
Version | SonarQube | sonar-scala | sonar-scala-extra
1820
--------|-----------|-------------|------------------
21+
2.4.0 | | 6.3.0 | 1.3.0
22+
2.4.0-full | 6.7.3 LTS | 6.3.0 | 1.3.0
1923
2.3.0 | | 6.2.0 | 1.3.0
2024
2.3.0-full | 6.7.3 LTS | 6.2.0 | 1.3.0
2125
2.2.1 | | 6.1.0 | 1.3.0
@@ -42,7 +46,7 @@ services:
4246
- plugins
4347
4448
plugins:
45-
image: mwizner/sonarqube-scala-plugins:2.3.0
49+
image: mwizner/sonarqube-scala-plugins:2.4.0
4650
volumes:
4751
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
4852
command: /bin/true
@@ -64,7 +68,7 @@ docker run -d --name sonarqube-scala-plugins-full \
6468
-e SONARQUBE_JDBC_USERNAME=sonar \
6569
-e SONARQUBE_JDBC_PASSWORD=sonar \
6670
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
67-
mwizner/sonarqube-scala-plugins:2.3.0-full
71+
mwizner/sonarqube-scala-plugins:2.4.0-full
6872
```
6973

7074
Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, SonarQube will use an embedded H2 database, which is not recommended in production.

‎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=6.2.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=6.4.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.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
- postgresql_data:/var/lib/postgresql/data
3131

3232
plugins:
33-
image: mwizner/sonarqube-scala-plugins:2.3.0
33+
image: mwizner/sonarqube-scala-plugins:2.4.0
3434
volumes:
3535
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
3636
command: /bin/true

‎release.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
4+
export VERSION=2.4.0
5+
6+
# Build
7+
docker build -t mwizner/sonarqube-scala-plugins:$VERSION -t mwizner/sonarqube-scala-plugins:latest $VERSION
8+
docker build -t mwizner/sonarqube-scala-plugins:$VERSION-full $VERSION-full
9+
10+
# Push
11+
docker push mwizner/sonarqube-scala-plugins:$VERSION
12+
docker push mwizner/sonarqube-scala-plugins:$VERSION-full
13+
docker push mwizner/sonarqube-scala-plugins:latest

0 commit comments

Comments
 (0)