From f8a592dc35d242b6a352efacdaba9c89fdaeb7dd Mon Sep 17 00:00:00 2001 From: ryanmerolle Date: Sun, 22 Jan 2023 00:07:37 -0500 Subject: [PATCH] update docker & Makefile --- .devcontainer/Dockerfile-plugin_dev | 2 +- Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile-plugin_dev b/.devcontainer/Dockerfile-plugin_dev index 5ec931d..55fd2cb 100644 --- a/.devcontainer/Dockerfile-plugin_dev +++ b/.devcontainer/Dockerfile-plugin_dev @@ -2,7 +2,7 @@ ARG NETBOX_VARIANT=v3.3 FROM netboxcommunity/netbox:${NETBOX_VARIANT} -ARG NETBOX_INITIALIZERS_VARIANT=3.3.1 +ARG NETBOX_INITIALIZERS_VARIANT=3.3.* ARG DEBIAN_FRONTEND=noninteractive diff --git a/Makefile b/Makefile index 2a03c41..44e8234 100644 --- a/Makefile +++ b/Makefile @@ -50,20 +50,20 @@ makemigrations: migrate: -${VENV_PY_PATH} ${NETBOX_MANAGE_PATH} migrate -.PHONY: startup_scripts -startup_scripts: - -echo "import runpy; runpy.run_path('/opt/netbox/startup_scripts')" | ${NETBOX_MANAGE_PATH} shell --interface python - .PHONY: collectstatic collectstatic: -${VENV_PY_PATH} ${NETBOX_MANAGE_PATH} collectstatic --no-input +.PHONY: initializers +initializers: + -${VENV_PY_PATH} ${NETBOX_MANAGE_PATH} load_initializer_data --path /opt/netbox/netbox/netbox-acls/.devcontainer/initializers + .PHONY: start ## Start NetBox start: - cd /opt/netbox/netbox/ && /opt/netbox/docker-entrypoint.sh && /opt/netbox/launch-netbox.sh .PHONY: all ## Run all PLUGIN DEV targets -all: setup makemigrations migrate collectstatic start +all: setup makemigrations migrate collectstatic initializers start #.PHONY: test #test: