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.

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

Prod deployment Merge to Main #33

Closed
wants to merge 49 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
205f74a
temporal annotation models and endpoints
BryonLewis Feb 6, 2024
e690218
migrations for temporal endpoints
BryonLewis Feb 7, 2024
6333167
Merge branch 'main' into temporal-annotations
BryonLewis Feb 7, 2024
db68837
updating migrations
BryonLewis Feb 7, 2024
e5e4a63
basics of rendering temporal annotations
BryonLewis Feb 7, 2024
3a81aea
linting
BryonLewis Feb 7, 2024
e077453
temporal creation/editing/deletion
BryonLewis Feb 16, 2024
7bf39fb
supporting multiple users with sequence and pulse annotations
BryonLewis Feb 16, 2024
963f3b9
client cleanup of minor issues
BryonLewis Feb 16, 2024
dd9abcd
adding prod-deployment infrastructure
BryonLewis Feb 16, 2024
f489ce1
adding environment variables
BryonLewis Feb 19, 2024
ebeaa0e
reconfigure items
BryonLewis Feb 19, 2024
d7bbe8b
updating prod config
BryonLewis Feb 19, 2024
0f66d76
updating prod config
BryonLewis Feb 19, 2024
a3d3308
allowed hosts
BryonLewis Feb 19, 2024
8cb91ea
adding fake email url
BryonLewis Feb 19, 2024
f2265ca
new configuration
BryonLewis Feb 19, 2024
3dba307
new configuration
BryonLewis Feb 19, 2024
57e6ca3
allowed hosts'
BryonLewis Feb 19, 2024
ac11a79
prod config
BryonLewis Feb 19, 2024
52f100e
add network to celery
BryonLewis Feb 19, 2024
b9fe319
prod
BryonLewis Feb 19, 2024
d37b41e
base configuration
BryonLewis Feb 19, 2024
b305465
adding traefik
BryonLewis Feb 19, 2024
6f01c8a
update traefik
BryonLewis Feb 19, 2024
c0344f4
port fix
BryonLewis Feb 19, 2024
ff04240
traefik config
BryonLewis Feb 19, 2024
fba95a0
traefik config
BryonLewis Feb 19, 2024
4fc3236
remove traefik
BryonLewis Feb 19, 2024
f1bfd2d
prod update
BryonLewis Feb 20, 2024
3ef3cdb
Merge branch 'main' into prod-deployment
BryonLewis Feb 20, 2024
e0d2d65
updating hostname
BryonLewis Feb 20, 2024
f75d9ae
updating hostname
BryonLewis Feb 20, 2024
3cbeba1
traefik routing
BryonLewis Feb 20, 2024
4037929
update nginx
BryonLewis Feb 20, 2024
46cf8bf
updating traefik
BryonLewis Feb 20, 2024
05853fb
reverting to nginx proxy
BryonLewis Feb 20, 2024
beced4d
issuer cert
BryonLewis Feb 20, 2024
2904eb1
trusted origins
BryonLewis Feb 20, 2024
99e08b6
add https mixin to configuration
BryonLewis Feb 20, 2024
a40fab8
update configuration
BryonLewis Feb 20, 2024
bd62f60
remove https
BryonLewis Feb 20, 2024
26f116c
refactoring prod .env files
BryonLewis Feb 20, 2024
e5d2344
refactoring environment files
BryonLewis Feb 21, 2024
f31c841
update docker
BryonLewis Feb 21, 2024
096ce32
linting fix
BryonLewis Feb 21, 2024
ae16c2e
add server hostname to environment
BryonLewis Feb 21, 2024
c6078f4
deployment docs update
BryonLewis Feb 21, 2024
a87023c
deployment docs update
BryonLewis Feb 21, 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
Prev Previous commit
Next Next commit
traefik routing
BryonLewis committed Feb 20, 2024
commit 3cbeba1e4c619603a226124f37f80d80b2fae15b
38 changes: 34 additions & 4 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ services:
restart: always
image: traefik:v2.4
container_name: traefik
networks:
- django-nginx
command: >
--providers.docker=true
--providers.docker.exposedByDefault=false
--entrypoints.web.address=:80
--log.level=${LOG_LEVEL:-DEBUG}
--providers.docker=true
--providers.docker.exposedByDefault=false
--providers.file.filename=/var/traefik/dynamic.yml
--entrypoints.web.address=:80
@@ -26,7 +26,7 @@ services:
# Traefik HTTPS Redirect
- "traefik.enable=true"
- "traefik.http.routers.http-catchall.entrypoints=web"
- "traefik.http.routers.http-catchall.rule=Host('batdetectai.kitware.com')"
- "traefik.http.routers.http-catchall.rule=Host(`batdetectai.kitware.com`)"
- "traefik.http.routers.http-catchall.middlewares=redirect-to-https-mddl@docker"
- "traefik.http.middlewares.redirect-to-https-mddl.redirectscheme.scheme=https"
volumes:
@@ -58,6 +58,33 @@ services:
- postgres
- rabbitmq
- minio
labels:
- "traefik.enable=true"

# Routing rule for /api
- "traefik.http.routers.django-api.rule=Host(`batdetectai.kitware.com`) && PathPrefix(`/api`)"
- "traefik.http.routers.django-api.service=django"
- "traefik.http.routers.django-api.middlewares=django-middleware"

# Routing rule for /admin
- "traefik.http.routers.django-admin.rule=Host(`batdetectai.kitware.com`) && PathPrefix(`/admin`)"
- "traefik.http.routers.django-admin.service=django"
- "traefik.http.routers.django-admin.middlewares=django-middleware"

# Routing rule for /accounts
- "traefik.http.routers.django-accounts.rule=Host(`batdetectai.kitware.com`) && PathPrefix(`/accounts`)"
- "traefik.http.routers.django-accounts.service=django"
- "traefik.http.routers.django-accounts.middlewares=django-middleware"

# Routing rule for /oauth
- "traefik.http.routers.django-oauth.rule=Host(`batdetectai.kitware.com`) && PathPrefix(`/oauth`)"
- "traefik.http.routers.django-oauth.service=django"
- "traefik.http.routers.django-oauth.middlewares=django-middleware"

# Routing rule for /static
- "traefik.http.routers.django-static.rule=Host(`batdetectai.kitware.com`) && PathPrefix(`/static`)"
- "traefik.http.routers.django-static.service=django"
- "traefik.http.routers.django-static.middlewares=django-middleware"
celery:
build:
context: .
@@ -97,6 +124,7 @@ services:
- "traefik.http.services.client-svc.loadbalancer.server.port=80"
postgres:
image: postgis/postgis:latest
env_file: ./dev/.env.prod.docker-compose
environment:
- POSTGRES_DB=${DJANGO_DATABASE_NAME:-django}
- POSTGRES_PASSWORD=${DJANGO_MINIO_STORAGE_SECRET_KEY:-postgres}
@@ -108,6 +136,7 @@ services:
- postgres:/var/lib/postgresql/data

rabbitmq:
env_file: ./dev/.env.prod.docker-compose
image: rabbitmq:management
networks:
- django-nginx
@@ -122,6 +151,7 @@ services:
# When run with a TTY, minio prints credentials on startup
tty: true
command: ["server", "/data", "--console-address", ":${DOCKER_MINIO_CONSOLE_PORT-9001}"]
env_file: ./dev/.env.prod.docker-compose
environment:
- MINIO_ROOT_USER=${DJANGO_MINIO_STORAGE_ACCESS_KEY:-minioAccessKey}
- MINIO_ROOT_PASSWORD=${DJANGO_DATABASE_PASSWORD:-minioSecretKey}
@@ -134,6 +164,7 @@ services:
- minio:/data

flower:
env_file: ./dev/.env.prod.docker-compose
build:
context: .
dockerfile: ./dev/django.Dockerfile
@@ -143,7 +174,6 @@ services:
"flower"
]
tty: false
env_file: ./dev/.env.prod.docker-compose
volumes:
- .:/opt/django-project
networks:

Unchanged files with check annotations Beta

export type OtherUserAnnotations = Record<string, {annotations: SpectrogramAnnotation[], temporal: SpectrogramTemporalAnnotation[]}>;
interface PaginatedNinjaResponse<T> {

Check warning on line 115 in client/src/api/api.ts

GitHub Actions / Lint [eslint]

'PaginatedNinjaResponse' is defined but never used
count: number,
items: T[],
}