Skip to content

Commit aaeb8ec

Browse files
mohamed-tamanmohamed-taman
committed
Merge branch 'release/5.1'
2 parents dbd2fe2 + 01b8f7e commit aaeb8ec

File tree

11 files changed

+21
-21
lines changed

11 files changed

+21
-21
lines changed

‎docker-compose-kafka.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ services:
147147
## Start - mongodb database definition
148148
### $ mongo
149149
mongodb:
150-
image: mongo:4.2.5-bionic
150+
image: mongo:4.2.6-bionic
151151
ports:
152152
- "27017-27019:27017-27019"
153153
healthcheck:
@@ -162,7 +162,7 @@ services:
162162
## Start - MySql database definition
163163
### $ mysql -uroot -h127.0.0.1 -p
164164
mysql:
165-
image: mysql:8.0.19
165+
image: mysql:8.0.20
166166
ports:
167167
- "3306:3306"
168168
environment:

‎docker-compose-partitions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ services:
133133
## Start - mongodb database definition
134134
### $ mongo
135135
mongodb:
136-
image: mongo:4.2.5-bionic
136+
image: mongo:4.2.6-bionic
137137
ports:
138138
- "27017-27019:27017-27019"
139139
healthcheck:
@@ -148,7 +148,7 @@ services:
148148
## Start - MySql database definition
149149
### $ mysql -uroot -h127.0.0.1 -p
150150
mysql:
151-
image: mysql:8.0.19
151+
image: mysql:8.0.20
152152
ports:
153153
- "3306:3306"
154154
environment:

‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ services:
8484
## Start - mongodb database definition
8585
### $ mongo
8686
mongodb:
87-
image: mongo:4.2.5-bionic
87+
image: mongo:4.2.6-bionic
8888
ports:
8989
- "27017-27019:27017-27019"
9090
healthcheck:
@@ -99,7 +99,7 @@ services:
9999
## Start - MySql database definition
100100
### $ mysql -uroot -h127.0.0.1 -p
101101
mysql:
102-
image: mysql:8.0.19
102+
image: mysql:8.0.20
103103
ports:
104104
- "3306:3306"
105105
environment:

‎store-base/store-build-chassis/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<java.version>14</java.version>
22-
<spring.cloud.version>Hoxton.SR4</spring.cloud.version>
22+
<spring.cloud.version>2020.0.0-M1</spring.cloud.version>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525

‎store-cloud-infra/authorization-server/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
2323
#### Start of actual image
2424
# ------------------------
2525
# Build image based on JDK 14 base image, based on latest debian buster OS
26-
FROM openjdk:14-slim-buster
26+
FROM openjdk:14.0.1-jdk-slim-buster
2727
VOLUME /tmp
2828

2929
# Set image information, but could be set to different location from command line

‎store-cloud-infra/edge-server/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
2323
#### Start of actual image
2424
# ------------------------
2525
# Build image based on JDK 14 base image, based on latest debian buster OS
26-
FROM openjdk:14-slim-buster
26+
FROM openjdk:14.0.1-jdk-slim-buster
2727
VOLUME /tmp
2828

2929
# Set image information, but could be set to different location from command line

‎store-cloud-infra/eureka-server/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Fatjar location, but could be set to different location from command line
@@ -23,7 +23,7 @@ RUN test ! -d ./snapshot-dependencies \
2323
#### Start of actual image
2424
# ------------------------
2525
# Build image based on JDK 14 base image, based on latest debian buster OS
26-
FROM openjdk:14-slim-buster
26+
FROM openjdk:14.0.1-jdk-slim-buster
2727
VOLUME /tmp
2828

2929
# Set image information, but could be set to different location from command line

‎store-services/product-service/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# 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
1717
#### Start of actual image
1818
# ------------------------
1919
# Build image based on JDK 14 base image, based on latest debian buster OS
20-
FROM openjdk:14-slim-buster
20+
FROM openjdk:14.0.1-jdk-slim-buster
2121
VOLUME /tmp
2222

2323
# Set image information, but could be set to different location from command line

‎store-services/recommendation-service/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
1717
#### Start of actual image
1818
# ------------------------
1919
# Build image based on JDK 14 base image, based on latest debian buster OS
20-
FROM openjdk:14-slim-buster
20+
FROM openjdk:14.0.1-jdk-slim-buster
2121
VOLUME /tmp
2222

2323
# Set image information, but could be set to different location from command line

‎store-services/review-service/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
1717
#### Start of actual image
1818
# ------------------------
1919
# Build image based on JDK 14 base image, based on latest debian buster OS
20-
FROM openjdk:14-slim-buster
20+
FROM openjdk:14.0.1-jdk-slim-buster
2121
VOLUME /tmp
2222

2323
# Set image information, but could be set to different location from command line

‎store-services/store-service/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#### Start of builder image
22
# ------------------------
33
# Builder stage to prepare application for final image
4-
FROM openjdk:14-slim-buster as builder
4+
FROM openjdk:14.0.1-jdk-slim-buster as builder
55
WORKDIR temp
66

77
# Could be set to different jar file location
@@ -17,7 +17,7 @@ RUN java -Djarmode=layertools -jar --enable-preview application.jar extract
1717
#### Start of actual image
1818
# ------------------------
1919
# Build image based on JDK 14 base image, based on latest debian buster OS
20-
FROM openjdk:14-slim-buster
20+
FROM openjdk:14.0.1-jdk-slim-buster
2121
VOLUME /tmp
2222

2323
# Set image information, but could be set to different location from command line

0 commit comments

Comments
 (0)