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 update #74

Merged
merged 8 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)***
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23.11
24.1
22 changes: 12 additions & 10 deletions dzga-compose.yaml → docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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

1 change: 0 additions & 1 deletion static/js/smarthome.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ function getDeviceLog(idx) {
html += '</tbody></table>'

$('#device_log_' + idx).html(html)
console.log(data.result[0])
});
}

Expand Down
Loading