Skip to content

Commit 79f0b99

Browse files
authored
Merge pull request #332 from tobiasge/image-deps
Update images in docker-compose
2 parents dd49060 + 74833a9 commit 79f0b99

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

docker-compose.test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
- netbox-media-files:/opt/netbox/netbox/media:z
2020
nginx:
2121
command: nginx -c /etc/netbox-nginx/nginx.conf
22-
image: nginx:1.17-alpine
22+
image: nginx:1.19-alpine
2323
depends_on:
2424
- netbox
2525
ports:
@@ -28,17 +28,17 @@ services:
2828
- netbox-static-files:/opt/netbox/netbox/static:ro
2929
- netbox-nginx-config:/etc/netbox-nginx/:ro
3030
postgres:
31-
image: postgres:11-alpine
31+
image: postgres:12-alpine
3232
env_file: env/postgres.env
3333
redis:
34-
image: redis:5-alpine
34+
image: redis:6-alpine
3535
command:
3636
- sh
3737
- -c # this is to evaluate the $REDIS_PASSWORD from the env
3838
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
3939
env_file: env/redis.env
4040
redis-cache:
41-
image: redis:5-alpine
41+
image: redis:6-alpine
4242
command:
4343
- sh
4444
- -c # this is to evaluate the $REDIS_PASSWORD from the env

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
- rqworker
3030
nginx:
3131
command: nginx -c /etc/netbox-nginx/nginx.conf
32-
image: nginx:1.17-alpine
32+
image: nginx:1.19-alpine
3333
depends_on:
3434
- netbox
3535
ports:
@@ -38,12 +38,12 @@ services:
3838
- netbox-static-files:/opt/netbox/netbox/static:ro
3939
- netbox-nginx-config:/etc/netbox-nginx/:ro
4040
postgres:
41-
image: postgres:11-alpine
41+
image: postgres:12-alpine
4242
env_file: env/postgres.env
4343
volumes:
4444
- netbox-postgres-data:/var/lib/postgresql/data
4545
redis:
46-
image: redis:5-alpine
46+
image: redis:6-alpine
4747
command:
4848
- sh
4949
- -c # this is to evaluate the $REDIS_PASSWORD from the env
@@ -52,7 +52,7 @@ services:
5252
volumes:
5353
- netbox-redis-data:/data
5454
redis-cache:
55-
image: redis:5-alpine
55+
image: redis:6-alpine
5656
command:
5757
- sh
5858
- -c # this is to evaluate the $REDIS_PASSWORD from the env

0 commit comments

Comments
 (0)