Merge pull request #74 from DewGew/DewGew-patch-1

Docker update

Dockerfile

@@ -11,6 +11,7 @@ COPY templates/ /templates/
 COPY modules/ /modules/
 COPY static/ /static/
 COPY requirements.txt /requirements.txt
+COPY VERSION.md /VERSION.md
 RUN pip install --no-cache-dir -r /requirements.txt
 
 # Create volume

README.md

@@ -23,7 +23,8 @@ bash <(curl -s https://raw.githubusercontent.com/DewGew/dzga-installer/master/DZ
 ```
 or exceute this for Docker and Docker compose:
 ```
-wget -P /home/${USER}/DZGA-Flask https://raw.githubusercontent.com/DewGew/DZGA-Flask/development/dzga-compose.yaml
-docker-compose -f /home/${USER}/DZGA-Flask/dzga-compose.yaml up -d
+wget -P /opt/DZGA-Flask https://raw.githubusercontent.com/DewGew/DZGA-Flask/development/docker-compose.yaml
+cd /opt/DZGA-Flask
+docker-compose up -d
 ```
 ***For more help read DZGA-Flask [wiki](https://github.com/DewGew/DZGA-Flask/wiki)***

VERSION.md

@@ -1 +1 @@
-23.11
+24.1

dzga-compose.yaml → docker-compose.yaml

@@ -1,17 +1,19 @@
-version: '3'
+version: '3.3'
+
 services:
-  dz-googleassistant:
-    image: dewgew/dzga-flask
+  dzga-flask:
+    image: dewgew/dzga-flask:latest
     container_name: dzga-flask
-    environment:
-      - PUID=1010
-      - PGID=1010
+    restart: unless-stopped
     ports:
       - 8181:8181
     volumes:
-      - /home/${USER}/DZGA-Flask/config:/config
-      - /home/${USER}/DZGA-Flask/uploads:/uploads
-      - /home/${USER}/DZGA-Flask/instance:/instance
+      - /opt/DZGA-Flask/config:/config
+      - /opt/DZGA-Flask/uploads:/uploads
+      - /opt/DZGA-Flask/instance:/instance
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    restart: unless-stopped
+    environment:
+      - PUID=1010
+      - PGID=1010
+

static/js/smarthome.js

@@ -330,7 +330,6 @@ function getDeviceLog(idx) {
 		html += '</tbody></table>'
 
 		$('#device_log_' + idx).html(html)
-		console.log(data.result[0])
 	});	
 }