Skip to content

Commit 621e310

Browse files
committed
Update Docker Compose and K8s yamls to use latest images
1 parent 4051ac4 commit 621e310

File tree

3 files changed

+86
-6
lines changed

3 files changed

+86
-6
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
version: '3.2'
2+
services:
3+
nginx:
4+
image: rawsanj/nginx-lb
5+
ports:
6+
- "80:80"
7+
depends_on:
8+
- spring-chat-1
9+
- spring-chat-2
10+
- spring-chat-3
11+
redis:
12+
image: bitnami/redis:6.0.9
13+
environment:
14+
- REDIS_PASSWORD=SuperSecretRedisPassword
15+
ports:
16+
- "6379:6379"
17+
volumes:
18+
- 'redis_data:/bitnami/redis/data'
19+
spring-chat-1:
20+
image: rawsanj/spring-redis-websocket:3.0.1-webflux
21+
environment:
22+
- SPRING_REDIS_HOST=redis
23+
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword
24+
ports:
25+
- "8080"
26+
depends_on:
27+
- redis
28+
spring-chat-2:
29+
image: rawsanj/spring-redis-websocket:3.0.1-webflux
30+
environment:
31+
- SPRING_REDIS_HOST=redis
32+
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword
33+
ports:
34+
- "8080"
35+
depends_on:
36+
- redis
37+
spring-chat-3:
38+
image: rawsanj/spring-redis-websocket:3.0.1-webflux
39+
environment:
40+
- SPRING_REDIS_HOST=redis
41+
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword
42+
ports:
43+
- "8080"
44+
depends_on:
45+
- redis
46+
volumes:
47+
redis_data:
48+
driver: local

src/main/docker/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
volumes:
1818
- 'redis_data:/bitnami/redis/data'
1919
spring-chat-1:
20-
image: rawsanj/spring-redis-websocket:2.5.2-native
20+
image: rawsanj/spring-redis-websocket:3.0.1-native
2121
environment:
2222
- SPRING_REDIS_HOST=redis
2323
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword
@@ -26,7 +26,7 @@ services:
2626
depends_on:
2727
- redis
2828
spring-chat-2:
29-
image: rawsanj/spring-redis-websocket:2.5.2-native
29+
image: rawsanj/spring-redis-websocket:3.0.1-native
3030
environment:
3131
- SPRING_REDIS_HOST=redis
3232
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword
@@ -35,7 +35,7 @@ services:
3535
depends_on:
3636
- redis
3737
spring-chat-3:
38-
image: rawsanj/spring-redis-websocket:2.5.2-native
38+
image: rawsanj/spring-redis-websocket:3.0.1-native
3939
environment:
4040
- SPRING_REDIS_HOST=redis
4141
- SPRING_REDIS_PASSWORD=SuperSecretRedisPassword

src/main/k8s/deployment.yaml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: spring-redis-websocket-deployment
4+
name: spring-redis-websocket-jvm-deployment
55
labels:
66
app: spring-redis-websocket
77
spec:
8-
replicas: 4
8+
replicas: 2
99
selector:
1010
matchLabels:
1111
app: spring-redis-websocket
@@ -16,7 +16,39 @@ spec:
1616
spec:
1717
containers:
1818
- name: spring-redis-websocket
19-
image: rawsanj/spring-redis-websocket:2.5.2-webflux
19+
image: rawsanj/spring-redis-websocket:3.0.1-webflux
20+
resources:
21+
limits:
22+
memory: "512Mi"
23+
cpu: "0.5"
24+
requests:
25+
memory: "512Mi"
26+
cpu: "0.5"
27+
ports:
28+
- containerPort: 8080
29+
envFrom:
30+
- configMapRef:
31+
name: spring-redis-websocket-config
32+
---
33+
apiVersion: apps/v1
34+
kind: Deployment
35+
metadata:
36+
name: spring-redis-websocket-native-deployment
37+
labels:
38+
app: spring-redis-websocket
39+
spec:
40+
replicas: 2
41+
selector:
42+
matchLabels:
43+
app: spring-redis-websocket
44+
template:
45+
metadata:
46+
labels:
47+
app: spring-redis-websocket
48+
spec:
49+
containers:
50+
- name: spring-redis-websocket
51+
image: rawsanj/spring-redis-websocket:3.0.1-native
2052
resources:
2153
limits:
2254
memory: "512Mi"

0 commit comments

Comments
 (0)