Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #332 from tobiasge/image-deps 

Update images in docker-compose
This commit is contained in:
Tobias Genannt 2020-09-01 14:04:21 +02:00 committed by GitHub
parent dd490605ca 74833a9b21
commit 79f0b997f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose.test.yml
View File

@ -19,7 +19,7 @@ services:
- netbox-media-files:/opt/netbox/netbox/media:z - netbox-media-files:/opt/netbox/netbox/media:z
nginx: nginx:
command: nginx -c /etc/netbox-nginx/nginx.conf command: nginx -c /etc/netbox-nginx/nginx.conf
image: nginx:1.17-alpine image: nginx:1.19-alpine
depends_on: depends_on:
- netbox - netbox
ports: ports:
@ -28,17 +28,17 @@ services:
- netbox-static-files:/opt/netbox/netbox/static:ro - netbox-static-files:/opt/netbox/netbox/static:ro
- netbox-nginx-config:/etc/netbox-nginx/:ro - netbox-nginx-config:/etc/netbox-nginx/:ro
postgres: postgres:
image: postgres:11-alpine image: postgres:12-alpine
env_file: env/postgres.env env_file: env/postgres.env
redis: redis:
image: redis:5-alpine image: redis:6-alpine
command: command:
- sh - sh
- -c # this is to evaluate the $REDIS_PASSWORD from the env - -c # this is to evaluate the $REDIS_PASSWORD from the env
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
env_file: env/redis.env env_file: env/redis.env
redis-cache: redis-cache:
image: redis:5-alpine image: redis:6-alpine
command: command:
- sh - sh
- -c # this is to evaluate the $REDIS_PASSWORD from the env - -c # this is to evaluate the $REDIS_PASSWORD from the env

8
docker-compose.yml
View File

@ -29,7 +29,7 @@ services:
- rqworker - rqworker
nginx: nginx:
command: nginx -c /etc/netbox-nginx/nginx.conf command: nginx -c /etc/netbox-nginx/nginx.conf
image: nginx:1.17-alpine image: nginx:1.19-alpine
depends_on: depends_on:
- netbox - netbox
ports: ports:
@ -38,12 +38,12 @@ services:
- netbox-static-files:/opt/netbox/netbox/static:ro - netbox-static-files:/opt/netbox/netbox/static:ro
- netbox-nginx-config:/etc/netbox-nginx/:ro - netbox-nginx-config:/etc/netbox-nginx/:ro
postgres: postgres:
image: postgres:11-alpine image: postgres:12-alpine
env_file: env/postgres.env env_file: env/postgres.env
volumes: volumes:
- netbox-postgres-data:/var/lib/postgresql/data - netbox-postgres-data:/var/lib/postgresql/data
redis: redis:
image: redis:5-alpine image: redis:6-alpine
command: command:
- sh - sh
- -c # this is to evaluate the $REDIS_PASSWORD from the env - -c # this is to evaluate the $REDIS_PASSWORD from the env
@ -52,7 +52,7 @@ services:
volumes: volumes:
- netbox-redis-data:/data - netbox-redis-data:/data
redis-cache: redis-cache:
image: redis:5-alpine image: redis:6-alpine
command: command:
- sh - sh
- -c # this is to evaluate the $REDIS_PASSWORD from the env - -c # this is to evaluate the $REDIS_PASSWORD from the env