Skip to content

186055022 & 186034612 common sensor refactor & modulizations #102

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

Merged
YaokunLin merged 7 commits into from
Oct 10, 2023
Merged

186055022 & 186034612 common sensor refactor & modulizations #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63016d9
removed tkl_dict_to_bs_dict
YaokunLin Oct 5, 2023
b3ca23f
put back tkl_dict_to_bs_dict
YaokunLin Oct 5, 2023
6868cc7
Merge branch 'develop' of https://github.com/button-inc/iot-system-pr…
YaokunLin Oct 6, 2023
e896dc6
unify bb and tkl
YaokunLin Oct 6, 2023
b861817
services folder
YaokunLin Oct 6, 2023
bbaabf0
modulized
YaokunLin Oct 7, 2023
7fae215
resolved conflicts
YaokunLin Oct 10, 2023
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
13 changes: 8 additions & 5 deletions api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM python:3.11

WORKDIR /
WORKDIR /api

COPY ./api/requirements.txt /requirements.txt
COPY ./api/requirements.txt /api/requirements.txt

RUN pip install --no-cache-dir --upgrade -r /requirements.txt
RUN pip install --no-cache-dir --upgrade -r /api/requirements.txt

# conditional copying of .env to bypass needing 2 Dockerfiles right now
COPY ./api/main.py ./api/utils.py ./api/mail_services.py ./api/google_routes_services.py ./api/.en[v] ./api/google_sheets_sa_key.jso[n] /
# Copy individual files and directories
COPY ./api/main.py ./api/utils.py /api/
COPY ./api/services/mail.py ./api/services/google_routes.py /api/services/
COPY ./api/manufacturers/basic.py ./api/manufacturers/brighter_bins.py ./api/manufacturers/tekelek.py /api/manufacturers/
COPY ./api/.en[v] ./api/google_sheets_sa_key.jso[n] /api/

EXPOSE 8080
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8080"]
Expand Down
Loading