diff --git a/.gitignore b/.gitignore index c313652..f9606a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/etc/postgres /venv diff --git a/README.md b/README.md index 03b5ff2..beeea5a 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,4 @@ ### services - [netbox](https://hub.docker.com/r/netboxcommunity/netbox) - [nginx](https://hub.docker.com/_/nginx) -- [postgres](https://hub.docker.com/_/postgres) - [redis](https://hub.docker.com/_/redis) diff --git a/docker-compose.yml b/docker-compose.yml index 26c3b05..ec52bf8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,6 @@ services: hostname: netbox_instance depends_on: - - postgres - redis - redis-cache - netbox-worker @@ -60,17 +59,6 @@ services: - netbox-static-files:/opt/netbox/netbox/static:ro command: nginx -c /etc/netbox-nginx/nginx.conf - postgres: - image: postgres:13.1-alpine - container_name: netbox_postgres - hostname: netbox_postgres - - ports: - - "5439:5432" - env_file: env/postgres.env - volumes: - - ./etc/postgres/var/lib/postgresql/data:/var/lib/postgresql/data - redis: image: redis:6.0.9-alpine container_name: netbox_redis diff --git a/env/.gitignore b/env/.gitignore index 0d7ae66..b2fe542 100644 --- a/env/.gitignore +++ b/env/.gitignore @@ -1,6 +1,5 @@ * !.gitignore !netbox.env-dist -!postgres.env-dist !redis.env-dist !redis-cache.env-dist diff --git a/env/netbox.env-dist b/env/netbox.env-dist index 9c98fd1..63504b8 100644 --- a/env/netbox.env-dist +++ b/env/netbox.env-dist @@ -8,7 +8,8 @@ SKIP_STARTUP_SCRIPTS=false RELEASE_CHECK_URL=https://api.github.com/repos/netbox-community/netbox/releases SECRET_KEY= -DB_HOST=postgres +DB_HOST=192.168.1.152 +DB_PORT=5432 DB_NAME=netbox DB_USER=netbox DB_PASSWORD= diff --git a/env/postgres.env-dist b/env/postgres.env-dist deleted file mode 100644 index f76b1e1..0000000 --- a/env/postgres.env-dist +++ /dev/null @@ -1,3 +0,0 @@ -POSTGRES_DB=netbox -POSTGRES_USER=netbox -POSTGRES_PASSWORD=