From 7f4042f3ac92d6042d8145f4f2ffa68cf3ed2800 Mon Sep 17 00:00:00 2001
From: TC <tomasz.cichacki@gmail.com>
Date: Thu, 21 Dec 2023 23:09:48 +0100
Subject: [PATCH] 	new file:   requirements.txt 	modified:  
 src/Dockerfile 	modified:   src/config.yaml 	modified:   src/run.sh

---
 .idea/.gitignore |   3 +++
 requirements.txt | Bin 0 -> 656 bytes
 src/Dockerfile   |  29 +++++++++++++++++------------
 src/config.yaml  |   2 +-
 src/run.sh       |   1 +
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 requirements.txt

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d10d411a8d07cc1d973189d3351324d7f85ed566
GIT binary patch
literal 656
zcmY*W%TB{E5S%j-p8{%}&~o9*0jVbroSop7Kp|;NsKmzuGi$poiX11NoyV?!e_8~1
z%=ko)4fh=)2JRyo-0^8}jS7x$hf7?bWkrt<ypcCqMMZ3RhR4iY@Jy>RUT5{mr8k}<
z>QJ*{W$dKi;e~l7rU=Y*MW=y(?>v+5_t8~6twmNB+A)<f-|}3kRv8<}m5MhVRVbG_
zTUy0EaZks@PO3$@$1^i{(-qPfqi42A#1q?ECe18bm1ZUP)X#%W>y?%6sBuEqJfG;R
zc|Y=dLoMYi8nwBNMAVz7muA1sHOiA*M)Cp<_7-1AWw(+PCL(*f1ZGt7;!#`DG{bW5
vksbkGT&3#9Qp`-cvs-AXUocHFP4U2dnv1;Rna8QyCnD-rw>al6{!jZ4euiE!

literal 0
HcmV?d00001

diff --git a/src/Dockerfile b/src/Dockerfile
index 65f6a97..4bf9180 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -2,18 +2,23 @@ ARG BUILD_FROM
 FROM $BUILD_FROM
 
 RUN apk add --no-cache python3
-RUN apk add --update py3-pip
+
+WORKDIR /app
+COPY requirements.txt .
 
 # Copy data for add-on
-COPY run.sh /
-COPY run.py /
-COPY requirements.txt /
-COPY main.py /
-COPY api.py /
-COPY moj_licznik.py /
-COPY log_config.py /
-COPY database_empty.sqlite /database.sqlite
-RUN chmod a+x /run.sh
-RUN pip install -r requirements.txt
+COPY run.sh .
+COPY run.py .
+COPY main.py .
+COPY api.py .
+COPY moj_licznik.py .
+COPY log_config.py .
+COPY database_empty.sqlite database.sqlite
+RUN chmod a+x run.sh
 
-CMD [ "/run.sh" ]
\ No newline at end of file
+RUN apk add --update --no-cache py3-pip && \
+    python3 -m venv /app/venv && \
+    source /app/venv/bin/activate && \
+    pip install -r requirements.txt
+
+CMD [ "/app/run.sh" ]
diff --git a/src/config.yaml b/src/config.yaml
index 19a6062..81542c7 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,6 +1,6 @@
 name: "Energa meter"
 description: "Energa meter addon"
-version: "1.0.0"
+version: "1.0.1"
 slug: "energa_meter"
 init: false
 options:
diff --git a/src/run.sh b/src/run.sh
index a85830e..0a9d911 100644
--- a/src/run.sh
+++ b/src/run.sh
@@ -5,5 +5,6 @@ export PASSWORD=$(bashio::config 'energa_password')
 export LOG_LEVEL=$(bashio::config 'log_level')
 
 bashio::log.info "Uruchamiam API"
+source /app/venv/bin/activate
 python run.py