From c4a553a8e53403a7963c81265a3dc6f12bf54afd Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sun, 30 Sep 2018 16:04:26 +0100 Subject: [PATCH] Upgrade sonar-scala to 6.6.0. --- 2.9.0-full/Dockerfile | 12 ++++++++++++ 2.9.0/Dockerfile | 12 ++++++++++++ README.md | 6 ++++-- README_DOCKERHUB.md | 8 ++++++-- dev/build.sh | 2 +- docker-compose.yml | 2 +- release.sh | 2 +- 7 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 2.9.0-full/Dockerfile create mode 100644 2.9.0/Dockerfile diff --git a/2.9.0-full/Dockerfile b/2.9.0-full/Dockerfile new file mode 100644 index 0000000..0df8562 --- /dev/null +++ b/2.9.0-full/Dockerfile @@ -0,0 +1,12 @@ +# SonarQube 6.7.5 LTS image with bundled sonar-scala 6.6.0 (https://github.com/mwz/sonar-scala). + +FROM sonarqube:6.7.5-alpine + +ENV SONAR_SCALA_VERSION 6.6.0 + +WORKDIR /opt/sonarqube/extensions/plugins +RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \ + "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" + +WORKDIR $SONARQUBE_HOME +ENTRYPOINT ["./bin/run.sh"] diff --git a/2.9.0/Dockerfile b/2.9.0/Dockerfile new file mode 100644 index 0000000..1d99428 --- /dev/null +++ b/2.9.0/Dockerfile @@ -0,0 +1,12 @@ +# Alpine image with bundled sonar-scala 6.6.0 (https://github.com/mwz/sonar-scala), +# which can be mounted as a volume into a SonarQube container. + +FROM alpine:3.7 + +ENV SONAR_SCALA_VERSION 6.6.0 + +RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates + +WORKDIR /opt/sonarqube/extensions/plugins +RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \ + "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" diff --git a/README.md b/README.md index 89c3076..2c6c830 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ docker-compose up -d 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`. -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). +You can also use a standalone docker image which contains SonarQube LTS with bundled Scala plugins [`mwizner/sonarqube-scala-plugins:2.9.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins). To start the container issue the following command: ```bash @@ -23,7 +23,7 @@ docker run -d --name sonarqube-scala-plugins-full \ -e SONARQUBE_JDBC_USERNAME=sonar \ -e SONARQUBE_JDBC_PASSWORD=sonar \ -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \ - mwizner/sonarqube-scala-plugins:2.8.0-full + mwizner/sonarqube-scala-plugins:2.9.0-full ``` 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. @@ -38,6 +38,7 @@ Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, SonarQu ## Compatibility Matrix Version | SonarQube | sonar-scala | sonar-scala-extra --------|-----------|-------------|------------------ +[2.9.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.9.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.6.0](https://github.com/mwz/sonar-scala/releases/tag/v6.6.0) | [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) | [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) | [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) @@ -56,6 +57,7 @@ Please note, that starting from version `2.7.0`, the images no longer contain th ## Changelog +- **2.9.0** - Upgraded sonar-scala to 6.6.0. - **2.8.0** - Upgraded sonar-scala to 6.5.1 & SonarQube to 6.7.5. - **2.7.0** - Upgraded sonar-scala to 6.5.0, which brings support for scapegoat. - **2.6.0** - Upgraded SonarQube to 6.7.4. diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md index 569980f..5007e9e 100644 --- a/README_DOCKERHUB.md +++ b/README_DOCKERHUB.md @@ -6,6 +6,8 @@ There are two types of images available: images with [sonar-scala](https://githu 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. +- `2.9.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.9.0/Dockerfile), [(v2.9.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.9.0) +- `2.9.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.9.0-full/Dockerfile), [(v2.9.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.9.0) - `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) - `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) - `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) @@ -29,6 +31,8 @@ Starting from version `2.7.0`, the images no longer contain the [sonar-scala-ext ## What's included Version | SonarQube | sonar-scala | sonar-scala-extra --------|-----------|-------------|------------------ +2.9.0 | | 6.6.0 | +2.9.0-full | 6.7.5 LTS | 6.6.0 | 2.8.0 | | 6.5.1 | 2.8.0-full | 6.7.5 LTS | 6.5.1 | 2.7.0 | | 6.5.0 | @@ -65,7 +69,7 @@ services: - plugins plugins: - image: mwizner/sonarqube-scala-plugins:2.8.0 + image: mwizner/sonarqube-scala-plugins:2.9.0 volumes: - sonarqube_plugins:/opt/sonarqube/extensions/plugins command: /bin/true @@ -87,7 +91,7 @@ docker run -d --name sonarqube-scala-plugins-full \ -e SONARQUBE_JDBC_USERNAME=sonar \ -e SONARQUBE_JDBC_PASSWORD=sonar \ -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \ - mwizner/sonarqube-scala-plugins:2.8.0-full + mwizner/sonarqube-scala-plugins:2.9.0-full ``` 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. diff --git a/dev/build.sh b/dev/build.sh index 1ad9db8..c9f1df3 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eu -export SONAR_SCALA_VERSION=6.6.0-SNAPSHOT +export SONAR_SCALA_VERSION=6.7.0-SNAPSHOT cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar . docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} . diff --git a/docker-compose.yml b/docker-compose.yml index cc54505..4cf5741 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: - postgresql_data:/var/lib/postgresql/data plugins: - image: mwizner/sonarqube-scala-plugins:2.8.0 + image: mwizner/sonarqube-scala-plugins:2.9.0 volumes: - sonarqube_plugins:/opt/sonarqube/extensions/plugins command: /bin/true diff --git a/release.sh b/release.sh index 4adeab4..6db771d 100755 --- a/release.sh +++ b/release.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eu -export VERSION=2.8.0 +export VERSION=2.9.0 # Build docker build -t mwizner/sonarqube-scala-plugins:$VERSION -t mwizner/sonarqube-scala-plugins:latest $VERSION