Merge branch 'master' into update-dotnet-version

nosinovacao · Dec 8, 2018 · 30aabde · 30aabde
2 parents dc2e684 + e144a14
commit 30aabde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM microsoft/dotnet:2.2.100-sdk
 
 ENV SONAR_SCANNER_MSBUILD_VERSION 4.4.2.1543
-ENV DOCKER_VERSION 17.06.2
+ENV DOCKER_VERSION 18.06.1 # reviewing this choice
 
 # Install Java 8
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y openjdk-8-jre

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This image was built with the following components:
 * dotnet-sdk-2.2.100 (stretch)
 * SonarQube MSBuild Scanner 4.4.2.1543
 * OpenJDK Java 8 (required for Sonar Scanner)
-* Docker binaries 17.06.2 (for running Docker in Docker using the docker.sock mount)
+* Docker binaries 18.06.1 (for running Docker in Docker using the docker.sock mount)
 
 ## Tags
 
@@ -56,9 +56,6 @@ docker run -it --rm -v <my-project-source-path>:/source nosinovacao/dotnet-sonar
 && dotnet /sonar-scanner/SonarScanner.MSBuild.dll end"
 ```
 
-
-
-
 ### Using Jenkins pipeline
 
 The following pipeline code will: