Skip to content

Commit

Permalink
Merges with dev ahead of standardization
Browse files Browse the repository at this point in the history
  • Loading branch information
LaunaG committed May 8, 2024
2 parents 186e9cb + 37fe69b commit 077fd72
Show file tree
Hide file tree
Showing 83 changed files with 121,770 additions and 5,694 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ run-notebooks:
$(project_name)-notebooks jupyter lab \
--port=8888 --ip='*' --NotebookApp.token='' \
--NotebookApp.password='' --no-browser --allow-root

run-full-stack:
cd $(current_abs_path) && \
. ./set_architecture.sh && \
docker compose --profile full-stack up --build
46 changes: 46 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
version: "3.4"


services:
# POSTGIS
postgis:
Expand Down Expand Up @@ -31,6 +33,32 @@ services:
- pgadmin
env_file:
- .env
ports:
- "8080:8080"

# DJANGO-Q2
django-q2:
restart: "no"
environment:
- DJANGO_SECRET_KEY=local
- ENV=DEV
- POSTGRES_DB=postgres
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_HOST=postgis
- POSTGRES_CHECK_TIMEOUT=120
build:
context: pipeline
command: ["bash", "setup.sh", "--use_djangoq"]
volumes:
- ./pipeline:/perpetual/pipeline
- ./data:/perpetual/data
depends_on:
- pipeline
env_file:
- .env
profiles:
- full-stack

# PGADMIN DATABASE GUI
pgadmin:
Expand All @@ -49,3 +77,21 @@ services:
- "443:443"
volumes:
- ./server.local.json:/pgadmin4/servers.json
logging:
driver: none

# WEB
web:
build:
context: web
depends_on:
- postgis
restart: always
ports:
- 3000:3000
volumes:
- ./web:/app
- /app/node_modules
- /app/.next
profiles:
- full-stack
551 changes: 551 additions & 0 deletions notebooks/DBSCAN.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 077fd72

Please sign in to comment.