Skip to content

Commit

Permalink
Update for local dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Powers committed May 17, 2024
1 parent a9e0107 commit 6992e51
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ifneq (,$(wildcard ./.env))
endif

DOCKER_TAG ?= $(shell git rev-parse --short HEAD)
DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/trovi:$(DOCKER_TAG)
DOCKER_IMAGE_LATEST ?= $(DOCKER_REGISTRY)/trovi:latest
DOCKER_IMAGE ?= trovi:$(DOCKER_TAG)
DOCKER_IMAGE_LATEST ?= trovi:latest
DOCKER_DEV_IMAGE ?= trovi-dev:$(DOCKER_TAG)
DOCKER_DEV_IMAGE_LATEST ?= trovi-dev:latest
DOCKER_DIR ?= docker
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.5"
services:
trovi:
container_name: trovi_web
image: ${DOCKER_IMAGE_LATEST}
image: trovi-dev
restart: on-failure
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${TROVI_PORT}/artifacts/?limit=1"]
Expand All @@ -16,7 +16,7 @@ services:
- ./media:/media
- static:/static
ports:
- "127.0.0.1:${TROVI_PORT}:${TROVI_PORT}"
- "8808:8808"
entrypoint: ["python3", "manage.py"]
command: ["runserver", "0.0.0.0:${TROVI_PORT}"]
depends_on:
Expand Down
1 change: 1 addition & 0 deletions trovi/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
ALLOWED_HOSTS = [
"localhost",
"127.0.0.1",
"chameleon.local",
TROVI_FQDN,
]

Expand Down

0 comments on commit 6992e51

Please sign in to comment.