Skip to content

Commit 17f2ff0

Browse files
authored
20250613 deployment upgrades (#191)
* pin allauth, set package name * copy manage.py for container * fix AWS missing name from prod.s3, add VITE_APP_LOGIN_REDIRECT
1 parent a527b0e commit 17f2ff0

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed

dev/.env.docker-compose

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ NABAT_API_URL=https://api.sciencebase.gov/nabat-graphql/graphql
1616
VITE_APP_API_ROOT=http://localhost:8000/api/v1
1717
VITE_APP_OAUTH_API_ROOT=http://localhost:8000/oauth/
1818
VITE_APP_OAUTH_CLIENT_ID=HSJWFZ2cIpWQOvNyCXyStV9hiOd7DfWeBOCzo4pP
19+
VITE_APP_LOGIN_REDIRECT=http://localhost:3000
1920
SERVERHOSTNAME=localhost

dev/.env.docker-compose-native

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ NABAT_API_URL=https://api.sciencebase.gov/nabat-graphql/graphql
1010
VITE_APP_API_ROOT=http://localhost:8000/api/v1
1111
VITE_APP_OAUTH_API_ROOT=http://localhost:8000/oauth/
1212
VITE_APP_OAUTH_CLIENT_ID=HSJWFZ2cIpWQOvNyCXyStV9hiOd7DfWeBOCzo4pP
13+
VITE_APP_LOGIN_REDIRECT=https://batdetectai.kitware.com
1314
SERVERHOSTNAME=localhost

dev/.env.prod.docker-compose.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ NABAT_API_URL=https://api.sciencebase.gov/nabat-graphql/graphql
1919
VITE_APP_API_ROOT=https://batdetectai.kitware.com/api/v1
2020
VITE_APP_OAUTH_API_ROOT=https://batdetectai.kitware.com/oauth/
2121
VITE_APP_OAUTH_CLIENT_ID=HSJWFZ2cIpWQOvNyCXyStV9hiOd7DfWeBOCzo4pP
22+
VITE_APP_LOGIN_REDIRECT=https://batdetectai.kitware.com

dev/.env.prod.s3.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ DOCKER_POSTGRES_PORT=
1010
AWS_ACCESS_KEY_ID=
1111
AWS_SECRET_ACCESS_KEY=
1212
DJANGO_AWS_S3_REGION_NAME=aws-region-1
13-
DJANGO_STORAGE_BUCKET_NAME=batsai-django-storage
13+
DJANGO_AWS_STORAGE_BUCKET_NAME=batsai-django-storage
1414
APPLICATION_CLIENT_ID=HSJWFZ2cIpWQOvNyCXyStV9hiOd7DfWeBOCzo4pP # Application Identification
1515
NABAT_API_URL=https://api.sciencebase.gov/nabat-graphql/graphql
1616
VITE_APP_API_ROOT=https://batdetectai.kitware.com/api/v1
1717
VITE_APP_OAUTH_API_ROOT=https://batdetectai.kitware.com/oauth/
1818
VITE_APP_OAUTH_CLIENT_ID=HSJWFZ2cIpWQOvNyCXyStV9hiOd7DfWeBOCzo4pP
19+
VITE_APP_LOGIN_REDIRECT=https://batdetectai.kitware.com

dev/django.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN set -ex \
2626
# over top of this directory, the .egg-link in site-packages resolves to the mounted directory
2727
# and all package modules are importable.
2828
COPY ./pyproject.toml /opt/django-project/pyproject.toml
29+
COPY ./manage.py /opt/django-project/manage.py
2930
COPY ./README.md /opt/django-project/README.md
3031

3132
# Use a directory name which will never be an import name, as isort considers this as first-party.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies = [
2929
"celery",
3030
"django-ninja",
3131
"django>=4.1, <4.2",
32-
"django-allauth",
32+
"django-allauth==0.63.6",
3333
"django-configurations[database,email]",
3434
"django-extensions",
3535
"django-oauth-toolkit",
@@ -75,7 +75,7 @@ prod = [
7575
]
7676

7777
[tool.hatch.build]
78-
packages = ["batai"]
78+
packages = ["bats_ai"]
7979

8080
[tool.black]
8181
line-length = 100

0 commit comments

Comments
 (0)