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

Commit bd64fd5

Browse files
mwzmwz
committed
Upgrade sonar-scala to 6.5.1 & SonarQube to 6.7.5.
1 parent c7ed178 commit bd64fd5

File tree

6 files changed

+40
-10
lines changed

6 files changed

+40
-10
lines changed

‎2.8.0-full/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SonarQube 6.7.5 LTS image with bundled sonar-scala 6.5.1 (https://github.com/mwz/sonar-scala).
2+
3+
FROM sonarqube:6.7.5-alpine
4+
5+
ENV SONAR_SCALA_VERSION 6.5.1
6+
7+
WORKDIR /opt/sonarqube/extensions/plugins
8+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
9+
"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"
10+
11+
WORKDIR $SONARQUBE_HOME
12+
ENTRYPOINT ["./bin/run.sh"]

‎2.8.0/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Alpine image with bundled sonar-scala 6.5.1 (https://github.com/mwz/sonar-scala),
2+
# which can be mounted as a volume into a SonarQube container.
3+
4+
FROM alpine:3.7
5+
6+
ENV SONAR_SCALA_VERSION 6.5.1
7+
8+
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
9+
10+
WORKDIR /opt/sonarqube/extensions/plugins
11+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
12+
"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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ docker-compose up -d
1414

1515
Once docker pulls all the required images and starts up the containers, the application should become available on [http://localhost](http://localhost). The default SonarQube login details for the Administrator account are `admin:admin`.
1616

17-
You can also use a standalone docker image which contains SonarQube LTS with bundled Scala plugins [`mwizner/sonarqube-scala-plugins:2.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins).
17+
You can also use a standalone docker image which contains SonarQube LTS with bundled Scala plugins [`mwizner/sonarqube-scala-plugins:2.8.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins).
1818

1919
To start the container issue the following command:
2020
```bash
@@ -23,7 +23,7 @@ docker run -d --name sonarqube-scala-plugins-full \
2323
-e SONARQUBE_JDBC_USERNAME=sonar \
2424
-e SONARQUBE_JDBC_PASSWORD=sonar \
2525
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
26-
mwizner/sonarqube-scala-plugins:2.7.0-full
26+
mwizner/sonarqube-scala-plugins:2.8.0-full
2727
```
2828
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.
2929

@@ -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.8.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.8.0) | 6.7.5 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14467)) | [6.5.1](https://github.com/mwz/sonar-scala/releases/tag/v6.5.1) |
4142
[2.7.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.7.0) | 6.7.4 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14377)) | [6.5.0](https://github.com/mwz/sonar-scala/releases/tag/v6.5.0) |
4243
[2.6.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.6.0) | 6.7.4 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14377)) | [6.4.0](https://github.com/mwz/sonar-scala/releases/tag/v6.4.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
4344
[2.5.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.5.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.4.0](https://github.com/mwz/sonar-scala/releases/tag/v6.4.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
@@ -55,6 +56,7 @@ Please note, that starting from version `2.7.0`, the images no longer contain th
5556

5657

5758
## Changelog
59+
- **2.8.0** - Upgraded sonar-scala to 6.5.1 & SonarQube to 6.7.5.
5860
- **2.7.0** - Upgraded sonar-scala to 6.5.0, which brings support for scapegoat.
5961
- **2.6.0** - Upgraded SonarQube to 6.7.4.
6062
- **2.5.0** - Upgraded sonar-scala to 6.4.0.

‎README_DOCKERHUB.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ There are two types of images available: images with [sonar-scala](https://githu
66

77
Starting from version `2.7.0`, the images no longer contain the [sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugin as sonar-scala provides Scapegoat support from version `6.5.0` onwards.
88

9+
- `2.8.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.8.0/Dockerfile), [(v2.8.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.8.0)
10+
- `2.8.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.8.0-full/Dockerfile), [(v2.8.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.8.0)
911
- `2.7.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0/Dockerfile), [(v2.7.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.7.0)
10-
- `2.7.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0-full/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
12+
- `2.7.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0-full/Dockerfile), [(v2.7.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.7.0)
1113
- `2.6.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.6.0/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
1214
- `2.6.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.6.0-full/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
1315
- `2.5.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.5.0/Dockerfile), [(v2.5.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.5.0)
@@ -27,6 +29,8 @@ Starting from version `2.7.0`, the images no longer contain the [sonar-scala-ext
2729
## What's included
2830
Version | SonarQube | sonar-scala | sonar-scala-extra
2931
--------|-----------|-------------|------------------
32+
2.8.0 | | 6.5.1 |
33+
2.8.0-full | 6.7.5 LTS | 6.5.1 |
3034
2.7.0 | | 6.5.0 |
3135
2.7.0-full | 6.7.4 LTS | 6.5.0 |
3236
2.6.0 | | 6.4.0 | 1.3.0
@@ -52,7 +56,7 @@ version: "2"
5256
5357
services:
5458
sonarqube:
55-
image: sonarqube:6.7.4-alpine # lts
59+
image: sonarqube:6.7.5-alpine # lts
5660
ports:
5761
- "80:9000"
5862
networks:
@@ -61,7 +65,7 @@ services:
6165
- plugins
6266
6367
plugins:
64-
image: mwizner/sonarqube-scala-plugins:2.7.0
68+
image: mwizner/sonarqube-scala-plugins:2.8.0
6569
volumes:
6670
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
6771
command: /bin/true
@@ -83,7 +87,7 @@ docker run -d --name sonarqube-scala-plugins-full \
8387
-e SONARQUBE_JDBC_USERNAME=sonar \
8488
-e SONARQUBE_JDBC_PASSWORD=sonar \
8589
-e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
86-
mwizner/sonarqube-scala-plugins:2.7.0-full
90+
mwizner/sonarqube-scala-plugins:2.8.0-full
8791
```
8892

8993
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.

‎docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
sonarqube:
5-
image: sonarqube:6.7.4-alpine # lts
5+
image: sonarqube:6.7.5-alpine # lts
66
ports:
77
- "80:9000"
88
networks:
@@ -19,7 +19,7 @@ services:
1919
- plugins
2020

2121
db:
22-
image: postgres:10.4-alpine
22+
image: postgres:10.5-alpine
2323
networks:
2424
- sonarnet
2525
environment:
@@ -30,7 +30,7 @@ services:
3030
- postgresql_data:/var/lib/postgresql/data
3131

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

‎release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -eu
33

4-
export VERSION=2.7.0
4+
export VERSION=2.8.0
55

66
# Build
77
docker build -t mwizner/sonarqube-scala-plugins:$VERSION -t mwizner/sonarqube-scala-plugins:latest $VERSION

0 commit comments

Comments
 (0)