Skip to content

Commit

Permalink
Update components and prepare release v0.8.0
Browse files Browse the repository at this point in the history
Closes #35
  • Loading branch information
headcr4sh committed Jan 25, 2019
1 parent 47a2cd3 commit 9c03d65
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 18 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Febin Rejoe <[email protected]> Muthiah
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"recommendations": [
"davidanson.vscode-markdownlint",
"editorConfig.editorConfig",
"editorconfig.editorconfig",
"jetmartin.bats",
"luggage66.awk",
"pivotal.vscode-concourse",
"timonwong.shellcheck"
Expand Down
4 changes: 4 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@

## Contributors

* Febin Rejoe &lt;[email protected]&gt;
* Horst Gutmann &lt;[email protected]&gt;
* Marek Urban
* Ming Xu &lt;[email protected]&gt;
* Pontus Arfwedson &lt;[email protected]&gt;
* Rekha Mittal &lt;[email protected]&gt;
* Rune Engseth &lt;[email protected]&gt;

## Third party components
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.8.0] - 2018-01-25

### Added

- Error handling when fetching the compute engine status has been improved.
Thanks to [Rekha Mittal](https://github.com/rekhamitt) for the provided
patch. ([#33](https://github.com/cathive/concourse-sonarqube-resource/issues/33))

### Updated

- The bundled sonar-scanner-cli has been updated to v3.3.0.1492.
- The bundled sonar-maven-plugin has been updated to v3.6.0.1398.

### Fixed

- Fix issues when an auth-token (instead of username + password) is being used
for authentication/authorization. Thanks to [Febin Rejoe](https://github.com/febinrejoe)
for the provided fix. ([#31](https://github.com/cathive/concourse-sonarqube-resource/issues/31))

## [0.7.2] - 2018-12-09

### Added
Expand Down
50 changes: 34 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
# ======================
# Global build arguments
# ======================
ARG MAVEN_VERSION="3.6.0"
ARG SONAR_SCANNER_CLI_VERSION="3.3.0.1492"
ARG SONAR_SCANNER_MAVEN_PLUGIN_VERSION="3.6.0.1398"

# =================================================
# Builder image (just for downloads / preparations)
# =================================================
FROM debian:jessie as builder
RUN apt-get -y update && apt-get -y install curl unzip
ARG MAVEN_VERSION
ARG SONAR_SCANNER_CLI_VERSION
ARG SONAR_SCANNER_DOWNLOAD_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_CLI_VERSION}-linux.zip"
RUN curl -s -L "${SONAR_SCANNER_DOWNLOAD_URL}" > "/tmp/sonar-scanner-cli-${SONAR_SCANNER_CLI_VERSION}-linux.zip"
RUN echo "8e74b8ffc4239fbd81efe221b6c48d02a379507fd1e9d5371645d0cd779a68fae404af8a8ca74a035515ede8c0f139c0f230bfd6182b8415dad373be35e67550 /tmp/sonar-scanner-cli-${SONAR_SCANNER_CLI_VERSION}-linux.zip" | sha512sum -c
RUN unzip -qq "/tmp/sonar-scanner-cli-${SONAR_SCANNER_CLI_VERSION}-linux.zip" -d "/data"
RUN mv "/data/sonar-scanner-${SONAR_SCANNER_CLI_VERSION}-linux" "/data/sonar-scanner"
RUN rm -f "/tmp/sonar-scanner-cli-${SONAR_SCANNER_CLI_VERSION}-linux.zip"

ARG SONAR_SCANNER_DOWNLOAD_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip"
RUN curl -s -L "${SONAR_SCANNER_DOWNLOAD_URL}" > "/tmp/sonar-scanner-cli-3.2.0.1227-linux.zip"
RUN echo "17b5a39b2790c42d6894c8b56b866a4c7591f0fcf83d54aa46b7a3dd61e05c5030c99ea074b9d4338abe30387a71de302e4fda4b843e6e404f0c53c62f142a3b /tmp/sonar-scanner-cli-3.2.0.1227-linux.zip" | sha512sum -c
RUN unzip -qq "/tmp/sonar-scanner-cli-3.2.0.1227-linux.zip" -d "/data"
RUN mv "/data/sonar-scanner-3.2.0.1227-linux" "/data/sonar-scanner"
RUN rm -f "/tmp/sonar-scanner-cli-3.2.0.1227-linux.zip"

ARG MAVEN_DOWNLOAD_URL="http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip"
RUN curl -s -L "${MAVEN_DOWNLOAD_URL}" > "/tmp/apache-maven-3.6.0-bin.zip"
RUN echo "7d14ab2b713880538974aa361b987231473fbbed20e83586d542c691ace1139026f232bd46fdcce5e8887f528ab1c3fbfc1b2adec90518b6941235952d3868e9 /tmp/apache-maven-3.6.0-bin.zip" | sha512sum -c
RUN unzip -qq "/tmp/apache-maven-3.6.0-bin.zip" -d "/data"
RUN mv "/data/apache-maven-3.6.0" "/data/apache-maven"
RUN rm -f "/tmp/apache-maven-3.6.0-bin.zip"
ARG MAVEN_DOWNLOAD_URL="http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip"
RUN curl -s -L "${MAVEN_DOWNLOAD_URL}" > "/tmp/apache-maven-${MAVEN_VERSION}-bin.zip"
RUN echo "7d14ab2b713880538974aa361b987231473fbbed20e83586d542c691ace1139026f232bd46fdcce5e8887f528ab1c3fbfc1b2adec90518b6941235952d3868e9 /tmp/apache-maven-${MAVEN_VERSION}-bin.zip" | sha512sum -c
RUN unzip -qq "/tmp/apache-maven-${MAVEN_VERSION}-bin.zip" -d "/data"
RUN mv "/data/apache-maven-${MAVEN_VERSION}" "/data/apache-maven"
RUN rm -f "/tmp/apache-maven-${MAVEN_VERSION}-bin.zip"

# ===========
# Final image
# ===========
FROM openjdk:8u151-alpine
RUN apk -f -q update \
&& apk -f -q add bash curl gawk git jq nodejs
Expand All @@ -33,15 +47,19 @@ RUN ln -sf "/opt/apache-maven/bin/mvn" "/usr/local/bin/mvn" \
&& ln -sf "/opt/apache-maven/bin/mvnDebug" "/usr/local/bin/mvnDebug"
ENV M2_HOME="/opt/apache-maven"

ARG SONAR_SCANNER_MAVEN_PLUGIN_VERSION
RUN mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get \
-DrepoUrl="https://repo.maven.apache.org/maven2/" \
-Dartifact="org.sonarsource.scanner.maven:sonar-maven-plugin:3.5.0.1254:jar"
-Dartifact="org.sonarsource.scanner.maven:sonar-maven-plugin:${SONAR_SCANNER_MAVEN_PLUGIN_VERSION}:jar"

ENV PATH="/usr/local/bin:/usr/bin:/bin"

LABEL maintainer="Benjamin P. Jung <[email protected]>" \
version="0.7.2" \
org.concourse-ci.target-version="4.2.1" \
version="0.8.0" \
maven.version="{MAVEN_VERSION}" \
sonar-scanner.cli.version="${SONAR_SCANNER_CLI_VERSION}" \
sonar-scanner.maven-plugin.version="${SONAR_SCANNER_MAVEN_PLUGIN_VERSION}" \
org.concourse-ci.target-version="4.2.2" \
org.concourse-ci.resource-id="sonarqube" \
org.concourse-ci.resource-name="SonarQube Static Code Analysis" \
org.concourse-ci.resource-homepage="https://github.com/cathive/concourse-sonarqube-resource"
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sonar.organization = cathive
sonar.projectKey = concourse-sonarqube-resource
sonar.projectName = Concourse CI SonarQube Resource
sonar.projectDescription = A resource for Concourse CI that performs SonarQube analyses and reports the state of a project`s quality goals.
sonar.projectVersion = 0.7.2
sonar.projectVersion = 0.8.0
sonar.links.homepage = https://github.com/cathive/concourse-sonarqube-resource
sonar.links.issue = https://github.com/cathive/concourse-sonarqube-resource/issues
sonar.links.ci = https://ci.cathive.com/
Expand Down

0 comments on commit 9c03d65

Please sign in to comment.