Skip to content

Commit

Permalink
chore: docker compose development overrides (#201)
Browse files Browse the repository at this point in the history
  • Loading branch information
ltucker authored Dec 12, 2024
1 parent 6547141 commit 61b7d25
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ coverage.txt
# diode-server
diode-server/.coverage/
diode-server/build/
diode-server/docker/dev.env

# Python
__pycache__/
Expand Down
4 changes: 2 additions & 2 deletions diode-server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ docker-compose-down:
.PHONY: docker-compose-dev-up
docker-compose-dev-up: docker-all
@DIODE_VERSION=$(DIODE_VERSION) COMMIT_SHA=$(COMMIT_SHA) DIODE_TAG=$(DIODE_VERSION)-$(COMMIT_SHA) PROJECT_NAME=diode-dev \
$(DOCKER_COMPOSE) --env-file docker/sample.env -f docker/docker-compose.yaml -f docker/docker-compose.dev.yaml up -d --build
$(DOCKER_COMPOSE) --env-file docker/sample.env --env-file docker/dev.env -f docker/docker-compose.yaml -f docker/docker-compose.dev.yaml up -d --build

.PHONY: docker-compose-dev-down
docker-compose-dev-down:
@DIODE_VERSION=$(DIODE_VERSION) COMMIT_SHA=$(COMMIT_SHA) DIODE_TAG=$(DIODE_VERSION)-$(COMMIT_SHA) PROJECT_NAME=diode-dev \
$(DOCKER_COMPOSE) --env-file docker/sample.env -f docker/docker-compose.yaml -f docker/docker-compose.dev.yaml down --remove-orphans
$(DOCKER_COMPOSE) --env-file docker/sample.env --env-file docker/dev.env -f docker/docker-compose.yaml -f docker/docker-compose.dev.yaml down --remove-orphans

.PHONY: docker-compose-netbox-up
docker-compose-netbox-up:
Expand Down
1 change: 1 addition & 0 deletions diode-server/docker/dev.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NETBOX_DIODE_PLUGIN_API_BASE_URL=http://host.docker.internal:8000/netbox/api/plugins/diode

0 comments on commit 61b7d25

Please sign in to comment.