Updated dockerfile to pin specific Gradle version (#77)

* Updated dockerfile to pin specific gradle version for gpcc-mocks and service Updated gradle wrapper version to use gradle 6.9.4 for gpcc-mocks and service Used 6.9.4 as 6.8.2 is not supported on DockerHub * resolve checkstyle error with whitespace
NHSDigital · Jan 2, 2024 · 309badd · 309badd
1 parent 82640b8
commit 309badd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/docker/gpcc-mocks/Dockerfile b/docker/gpcc-mocks/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:jdk11 AS build
+FROM gradle:6.9.4-jdk11 AS build
 
 COPY --chown=gradle:gradle gpcc-mocks /home/gradle/gpcc-mocks
 

diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:jdk11-hotspot AS build
+FROM gradle:6.9.4-jdk11 AS build
 
 COPY --chown=gradle:gradle service /home/gradle/service
 

diff --git a/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties b/gpcc-mocks/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/gradle/wrapper/gradle-wrapper.properties b/service/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java b/service/src/main/java/uk/nhs/adaptors/gpc/consumer/web/RequestBuilderService.java
@@ -33,5 +33,4 @@ public ExchangeStrategies buildExchangeStrategies() {
                 configurer -> configurer.defaultCodecs()
                     .maxInMemorySize(BYTE_COUNT)).build();
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,5 +33,4 @@ public ExchangeStrategies buildExchangeStrategies() { @@
                     configurer -> configurer.defaultCodecs()
                         .maxInMemorySize(BYTE_COUNT)).build();
         }
     }