diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 5ccd92a..23f74ca 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -19,7 +19,7 @@ services: - netbox-media-files:/opt/netbox/netbox/media:z nginx: command: nginx -c /etc/netbox-nginx/nginx.conf - image: nginx:1.17-alpine + image: nginx:1.19-alpine depends_on: - netbox ports: @@ -28,17 +28,17 @@ services: - netbox-static-files:/opt/netbox/netbox/static:ro - netbox-nginx-config:/etc/netbox-nginx/:ro postgres: - image: postgres:11-alpine + image: postgres:12-alpine env_file: env/postgres.env redis: - image: redis:5-alpine + image: redis:6-alpine command: - sh - -c # this is to evaluate the $REDIS_PASSWORD from the env - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose env_file: env/redis.env redis-cache: - image: redis:5-alpine + image: redis:6-alpine command: - sh - -c # this is to evaluate the $REDIS_PASSWORD from the env diff --git a/docker-compose.yml b/docker-compose.yml index 9272b91..001694c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: - rqworker nginx: command: nginx -c /etc/netbox-nginx/nginx.conf - image: nginx:1.17-alpine + image: nginx:1.19-alpine depends_on: - netbox ports: @@ -38,12 +38,12 @@ services: - netbox-static-files:/opt/netbox/netbox/static:ro - netbox-nginx-config:/etc/netbox-nginx/:ro postgres: - image: postgres:11-alpine + image: postgres:12-alpine env_file: env/postgres.env volumes: - netbox-postgres-data:/var/lib/postgresql/data redis: - image: redis:5-alpine + image: redis:6-alpine command: - sh - -c # this is to evaluate the $REDIS_PASSWORD from the env @@ -52,7 +52,7 @@ services: volumes: - netbox-redis-data:/data redis-cache: - image: redis:5-alpine + image: redis:6-alpine command: - sh - -c # this is to evaluate the $REDIS_PASSWORD from the env