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

Jump to bottom

Updated container and new Bothell buildings #272

Merged
merged 4 commits into from
May 23, 2024
Merged

Updated container and new Bothell buildings #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
083f676
download scout from main branch, not develop
David-Strupinski Sep 22, 2023
0022797
Pin some things, update some things...
abztrakt May 22, 2024
3628706
Additional Bothell buildings with study spaces
abztrakt May 22, 2024
1f01b9c
Spelling
abztrakt May 22, 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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG DJANGO_CONTAINER_VERSION=1.4.1
ARG DJANGO_CONTAINER_VERSION=1.4.2

FROM gcr.io/uwit-mci-axdd/django-container:${DJANGO_CONTAINER_VERSION} as app-container
FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-container

USER root
RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y
Expand All @@ -19,7 +19,7 @@ RUN . /app/bin/activate && pip install nodeenv && nodeenv -p &&\
RUN . /app/bin/activate && python manage.py collectstatic --noinput &&\
python manage.py compress -f

FROM gcr.io/uwit-mci-axdd/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container

COPY --from=0 /app/ /app/
COPY --from=0 /static/ /static/
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
-e git+https://github.com/uw-it-aca/scout.git@develop#egg=scout
-e git+https://github.com/uw-it-aca/uw-restclients-spotseeker.git#egg=uw_restclients_spotseeker
-e git+https://github.com/uw-it-aca/scout.git#egg=scout
-e git+https://github.com/uw-it-aca/uw-restclients-spotseeker.git@v0.3#egg=uw_restclients_spotseeker
-e .
5 changes: 5 additions & 0 deletions scout_manager/dao/buildings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,14 @@
"Chase House": {"campus": "bothell"},
"Commons Hall (UW2)": {"campus": "bothell"},
"Discovery Hall (UW3)": {"campus": "bothell"},
"Horizon Hall (VHZN)": {"campus": "bothell"},
"Husky Hall (HH)": {"campus": "bothell"},
"Husky Village Apartments": {"campus": "bothell"},
"Innovation Hall (INV)": {"campus": "bothell"},
"North Creek Events Center (NCEC)": {"campus": "bothell"},
"Residential Village (VFRS)": {"campus": "bothell"},
"Summit Hall (VSMT)": {"campus": "bothell"},
"Terrace Dining Pavilion (VTRC)": {"campus": "bothell"},
"Truly House": {"campus": "bothell"},
"Birmingham Block (BB)": {"campus": "tacoma"},
"Birmingham Hay & Seed (BHS)": {"campus": "tacoma"},
Expand Down
2 changes: 2 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
"setuptools",
"UW-Django-SAML2",
"UW-RestClients-GWS~=2.3",
"lxml==4.9.4",
"xmlsec==1.3.13"
],
license="Apache License, Version 2.0", # example license
description="A Django app for managing spaces in spotseeker_server.",
Expand Down
Loading