Merge branch 'release/5.1'

mohamed-taman · May 10, 2020 · aaeb8ec · aaeb8ec
2 parents dbd2fe2 + 01b8f7e
commit aaeb8ec
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml
@@ -147,7 +147,7 @@ services:
   ## Start - mongodb database definition
   ### $ mongo
   mongodb:
-    image: mongo:4.2.5-bionic
+    image: mongo:4.2.6-bionic
     ports:
       - "27017-27019:27017-27019"
     healthcheck:
@@ -162,7 +162,7 @@ services:
   ## Start - MySql database definition
   ### $ mysql -uroot -h127.0.0.1 -p
   mysql:
-    image: mysql:8.0.19
+    image: mysql:8.0.20
     ports:
       - "3306:3306"
     environment:

diff --git a/docker-compose-partitions.yml b/docker-compose-partitions.yml
@@ -133,7 +133,7 @@ services:
   ## Start - mongodb database definition
   ### $ mongo
   mongodb:
-    image: mongo:4.2.5-bionic
+    image: mongo:4.2.6-bionic
     ports:
       - "27017-27019:27017-27019"
     healthcheck:
@@ -148,7 +148,7 @@ services:
   ## Start - MySql database definition
   ### $ mysql -uroot -h127.0.0.1 -p
   mysql:
-    image: mysql:8.0.19
+    image: mysql:8.0.20
     ports:
       - "3306:3306"
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -84,7 +84,7 @@ services:
   ## Start - mongodb database definition
   ### $ mongo
   mongodb:
-    image: mongo:4.2.5-bionic
+    image: mongo:4.2.6-bionic
     ports:
       - "27017-27019:27017-27019"
     healthcheck:
@@ -99,7 +99,7 @@ services:
   ## Start - MySql database definition
   ### $ mysql -uroot -h127.0.0.1 -p
   mysql:
-    image: mysql:8.0.19
+    image: mysql:8.0.20
     ports:
       - "3306:3306"
     environment:

diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <java.version>14</java.version>
-        <spring.cloud.version>Hoxton.SR4</spring.cloud.version>
+        <spring.cloud.version>2020.0.0-M1</spring.cloud.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

diff --git a/store-cloud-infra/authorization-server/Dockerfile b/store-cloud-infra/authorization-server/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-cloud-infra/edge-server/Dockerfile b/store-cloud-infra/edge-server/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-cloud-infra/eureka-server/Dockerfile b/store-cloud-infra/eureka-server/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-services/product-service/Dockerfile b/store-services/product-service/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Fatjar location, but could be set to different location from command line
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-services/recommendation-service/Dockerfile b/store-services/recommendation-service/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-services/review-service/Dockerfile b/store-services/review-service/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line

diff --git a/store-services/store-service/Dockerfile b/store-services/store-service/Dockerfile
@@ -1,7 +1,7 @@
 #### Start of builder image
 # ------------------------
 # Builder stage to prepare application for final image
-FROM openjdk:14-slim-buster as builder
+FROM openjdk:14.0.1-jdk-slim-buster as builder
 WORKDIR temp
 
 # Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
 #### Start of actual image
 # ------------------------
 # Build image based on JDK 14 base image, based on latest debian buster OS
-FROM openjdk:14-slim-buster
+FROM openjdk:14.0.1-jdk-slim-buster
 VOLUME /tmp
 
 # Set image information, but could be set to different location from command line