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

Commit d972722

Browse files
committed
Use mwizner/sonarqube-scala-plugins docker image.
1 parent 3c50571 commit d972722

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@ Once docker pulls all the required images and starts up the containers, the appl
2121

2222

2323
## Compatibility Matrix
24-
Version | SonarQube version
25-
--------|------------------
26-
[2.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.0.0) | 6.7.1 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([what's new](https://www.sonarqube.org/sonarqube-6-7-lts))
27-
[1.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/1.0.0) | 5.6.7 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE56/Documentation))
24+
Version | SonarQube | sonar-scala | sonar-scapegoat |
25+
--------|-------------------------|-----------------|
26+
[2.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.0.0), [2.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.0.0) | 6.7.1 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([what's new](https://www.sonarqube.org/sonarqube-6-7-lts)) | 6.0.0 | 1.3.0
27+
[1.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/1.0.0) | 5.6.7 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE56/Documentation)) | 0.0.3 | 1.3.0
2828

2929

3030
## Recommendations
3131
[sbt-sonar](https://github.com/mwz/sbt-sonar) is an sbt plugin which provides a way to automate analysis of Scala projects with SonarQube.
3232

33+
## Changelog
34+
- **2.1.0** - Published docker image with Scala plugins to dockerhub [mwizner/sonarqube-scala-plugins](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins).
35+
- **2.0.0** - SonarQube 6.7.1 LTS (sonar-scala v6.0.0, sonar-scapegoat-plugin v1.3.0).
36+
- **1.0.0** - SonarQube 5.6.7 LTS (sonar-scala v0.0.3, sonar-scapegoat-plugin v1.3.0).
37+
3338
## License
3439
The project is licensed under the Apache License v2. See the [LICENSE file](LICENSE) for more details.

docker-compose.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ services:
88
networks:
99
- sonarnet
1010
environment:
11+
- SONARQUBE_JDBC_USERNAME=sonar
12+
- SONARQUBE_JDBC_PASSWORD=sonar
1113
- SONARQUBE_JDBC_URL=jdbc:postgresql://db:5432/sonar
14+
volumes:
15+
- sonarqube_conf:/opt/sonarqube/conf
16+
- sonarqube_data:/opt/sonarqube/data
17+
- sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
1218
volumes_from:
1319
- plugins
1420

@@ -24,27 +30,19 @@ services:
2430
- postgresql_data:/var/lib/postgresql/data
2531

2632
plugins:
27-
image: sonarqube:6.7.1-alpine
33+
image: mwizner/sonarqube-scala-plugins:2.1.0
2834
volumes:
29-
- sonarqube_conf:/opt/sonarqube/conf
30-
- sonarqube_data:/opt/sonarqube/data
31-
- sonarqube_extensions:/opt/sonarqube/extensions
32-
- sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
35+
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
3336
command: /bin/true
3437

35-
build_plugins:
36-
build: plugins
37-
volumes_from:
38-
- plugins
39-
4038
networks:
4139
sonarnet:
4240
driver: bridge
4341

4442
volumes:
4543
sonarqube_conf:
4644
sonarqube_data:
47-
sonarqube_extensions:
4845
sonarqube_bundled-plugins:
46+
sonarqube_plugins:
4947
postgresql:
5048
postgresql_data:

plugins/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ ENV SONAR_SCALA_VERSION 6.0.0
55

66
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
77

8-
WORKDIR /tmp/sonarqube/plugins
8+
WORKDIR /opt/sonarqube/extensions/plugins
99
RUN wget -O "sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar" \
1010
"https://github.com/arthepsy/sonar-scala-extra/releases/download/v${SONAR_SCAPEGOAT_VERSION}/sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar"
1111
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
1212
"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"
13-
VOLUME /opt/sonarqube
14-
15-
CMD cp -R /tmp/sonarqube/plugins/* /opt/sonarqube/extensions/plugins

0 commit comments

Comments
 (0)