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

Refactoring the proxy. #143

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Refactoring the proxy. #143

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
41c6412
Refactoring the proxy.
Nexarian Jan 8, 2025
a7c10b2
Add better aggregation and deadlock handling
Nexarian Feb 21, 2025
0df9ed6
Updating API lock strategy
Nexarian Mar 5, 2025
a13b477
Updating api lock
Nexarian Mar 5, 2025
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
14 changes: 10 additions & 4 deletions proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
FROM python:3.10-alpine
FROM python:3.13-alpine
RUN apk add gcc python3-dev musl-dev linux-headers
WORKDIR /app
COPY requirements.txt /app/requirements.txt
COPY ./proxy/requirements.txt /app/requirements.txt
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume most would build the container from the directory that contains the Dockerfile (proxy), which is where my automation goes to build and push the proxy container. This would break that. Did you have another idea?

Copy link
Contributor Author

@Nexarian Nexarian Feb 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this because I needed to test changes to the proxy AND pypowerwall itself and I didn't know of another good way to build them together, did I miss the memo on how to do that?

Anyway, I think what I should do is move this configuration to a different Dockerfile and leave this one alone.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point. My dev and beta build script copies the library before running the build (cp -r ../pypowerwall .)

RUN pip3 install --upgrade pip
RUN pip3 install -r requirements.txt
COPY . .
COPY pypowerwall /app/pypowerwall/pypowerwall/
COPY setup.py requirements.txt README.md /app/pypowerwall/
RUN pip3 install /app/pypowerwall
COPY ./proxy .
CMD ["python3", "server.py"]
EXPOSE 8675
EXPOSE 8675
EXPOSE 8685
13 changes: 11 additions & 2 deletions proxy/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
pypowerwall==0.12.6
bs4==0.0.2
beautifulsoup4
bs4
protobuf
psutil
pypowerwall
pyroute2
requests
setuptools
teslapy
urllib3
wheel
Loading