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

Docker, requirements and amhf support #216

Merged
merged 23 commits into from
Mar 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
merged requirement files
GeoDerp committed Mar 2, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e3358c7621425786456eba188b364721c31a72c1
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/python:0-3.11
# EXPOSE 5000:5000
COPY .devcontainer/setup.sh requirements.txt requirements_webserver.txt ./
COPY .devcontainer/setup.sh requirements.txt ./
RUN ./setup.sh
2 changes: 1 addition & 1 deletion .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ main() {
export HDF5_DIR=/usr/include/hdf5
pip install netCDF4

pip install -r requirements_webserver.txt
pip install -r requirements.txt
pip install requests-mock

rm -rf "$0"
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -123,9 +123,6 @@ ENTRYPOINT [ "python3", "-m", "emhass.web_server","--addon", "True" , "--no_resp
#EMHASS STANDALONE
FROM base as standalone

COPY requirements_webserver.txt /app/
RUN pip3 install --extra-index-url=https://www.piwheels.org/simple --no-cache-dir --break-system-packages -r requirements_webserver.txt

COPY src/emhass/ /app/src/emhass/
COPY src/emhass/templates/ /app/src/emhass/templates/
COPY src/emhass/static/ /app/src/emhass/static/
2 changes: 1 addition & 1 deletion docs/develop.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ _confirm terminal is in the root `emhass` directory before starting_

**Install requirements**
```bash
python3 -m pip install --extra-index-url=https://www.piwheels.org/simple -r requirements_webserver.txt
python3 -m pip install --extra-index-url=https://www.piwheels.org/simple -r requirements.txt
```

**Create a developer environment:**
6 changes: 5 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -11,4 +11,8 @@ h5py==3.10.0
pulp>=2.4
pyyaml>=5.4.1
tables<=3.9.1
skforecast==0.11.0
skforecast==0.11.0
# web server packadges
flask>=2.0.3
waitress>=2.1.1
plotly>=5.6.0
4 changes: 0 additions & 4 deletions requirements_webserver.txt

This file was deleted.