Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for local dev #193

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update for local dev #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6992e51
Update for local dev
Mark-Powers May 17, 2024
ce4edb6
Update sample env
Mark-Powers May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DJANGO_LOG_LEVEL=DEBUG
DJANGO_SQL_LEVEL=INFO

# Database
DB_ENGINE=
DB_ENGINE=django.db.backends.mysql
DB_NAME=trovi
DB_HOST=db
DB_PORT=3306
Expand Down Expand Up @@ -49,11 +49,11 @@ OPENSTACK_SERVICE_PASSWORD=
# Commont out in prod for randomly generated key
TROVI_TOKEN_SIGNING_KEY=heehooimmasigningkey
# Keycloak realm management
CHAMELEON_KEYCLOAK_SERVER_URL=https://auth.dev.chameleoncloud.org/auth
CHAMELEON_KEYCLOAK_REALM_NAME=chameleon
CHAMELEON_KEYCLOAK_SERVER_URL=https://chameleon.local:8080/auth
CHAMELEON_KEYCLOAK_REALM_NAME=Chameleon
# This client is in the Keycloak "master" realm
CHAMELEON_KEYCLOAK_TROVI_ADMIN_CLIENT_ID=trovi-dev
CHAMELEON_KEYCLOAK_TROVI_ADMIN_CLIENT_SECRET=
CHAMELEON_KEYCLOAK_TROVI_ADMIN_CLIENT_ID=trovi-local-dev
CHAMELEON_KEYCLOAK_TROVI_ADMIN_CLIENT_SECRET=trovi-local-dev-secret
# Testing
CHAMELEON_KEYCLOAK_TEST_USER_USERNAME=
CHAMELEON_KEYCLOAK_TEST_USER_PASSWORD=
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading