Merge pull request #111 from ryanmerolle/dev

1.2.0 release

Author: ryanmerolle

.devcontainer/Dockerfile-plugin_dev

@@ -1,8 +1,8 @@
-ARG NETBOX_VARIANT=v3.3
+ARG NETBOX_VARIANT=v3.4
 
 FROM netboxcommunity/netbox:${NETBOX_VARIANT}
 
-ARG NETBOX_INITIALIZERS_VARIANT=3.3.*
+ARG NETBOX_INITIALIZERS_VARIANT=3.4.*
 
 ARG DEBIAN_FRONTEND=noninteractive
 

.devcontainer/docker-compose.yml

@@ -10,37 +10,53 @@ services:
       #- netbox-worker
     env_file: env/netbox.env
     user: 'unit:root'
+    healthcheck:
+      start_period: 60s
+      timeout: 3s
+      interval: 15s
+      test: "curl -f http://localhost:8080/api/ || exit 1"
     volumes:
-      - ./initializers:/opt/netbox/initializers:z,ro
       - ./configuration:/etc/netbox/config:z,ro
+      #- ./reports:/etc/netbox/reports:z,ro
+      #- ./scripts:/etc/netbox/scripts:z,ro
       #- netbox-media-files:/opt/netbox/netbox/media:z
   #netbox-worker:
   #  <<: *netbox
   #  depends_on:
-  #    - redis
-  #    - postgres
+  #    netbox:
+  #      condition: service_healthy
   #  command:
   #    - /opt/netbox/venv/bin/python
   #    - /opt/netbox/netbox/manage.py
   #    - rqworker
+  #  healthcheck:
+  #    start_period: 20s
+  #    timeout: 3s
+  #    interval: 15s
+  #    test: "ps -aux | grep -v grep | grep -q rqworker || exit 1"
   #netbox-housekeeping:
   #  <<: *netbox
   #  depends_on:
-  #  - redis
-  #  - postgres
+  #    netbox:
+  #      condition: service_healthy
   #  command:
   #  - /opt/netbox/housekeeping.sh
+  #  healthcheck:
+  #    start_period: 20s
+  #    timeout: 3s
+  #    interval: 15s
+  #    test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1"
 
   # postgres
   postgres:
-    image: postgres:14-alpine
+    image: postgres:15-alpine
     env_file: env/postgres.env
     volumes:
       - netbox-postgres-data:/var/lib/postgresql/data
 
   # redis
   redis:
-    image: redis:6-alpine
+    image: redis:7-alpine
     command:
       - sh
       - -c # this is to evaluate the $REDIS_PASSWORD from the env
@@ -49,12 +65,14 @@ services:
     #volumes:
     #  - netbox-redis-data:/data
   #redis-cache:
-  #  image: redis:6-alpine
+  #  image: redis:7-alpine
   #  command:
-  #   - sh
-  #   - -c # this is to evaluate the $REDIS_PASSWORD from the env
-  #   - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
+  #    - sh
+  #    - -c # this is to evaluate the $REDIS_PASSWORD from the env
+  #    - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
   #  env_file: env/redis-cache.env
+  #  volumes:
+  #    - netbox-redis-cache-data:/data
 
 volumes:
   #netbox-media-files:
@@ -63,3 +81,5 @@ volumes:
     driver: local
   #netbox-redis-data:
   #  driver: local
+  #netbox-redis-cache-data:
+  #  driver: local