From 6af33c5016b336e1ced9b024d54d5521928a98af Mon Sep 17 00:00:00 2001 From: "radim.kliment" Date: Sun, 26 Jan 2025 11:36:18 +0100 Subject: [PATCH 1/3] feat(wl): added whitelist to docker image --- .env | 2 +- Dockerfile | 2 +- chroot/opt/venv/start.sh | 3 ++- examples/docker-compose.yml | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index c7ac6c4..4129e8f 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VERSION=1.4.0.1 +VERSION=1.5.0 NON_INTERACTIVE=false BUILDX=true BUILDX_PURGE=false diff --git a/Dockerfile b/Dockerfile index f229a2f..b709ccc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ SHELL ["/bin/bash", "-ec"] RUN apt update && apt install --no-install-recommends -y bluez build-essential RUN python3 -m venv /opt/venv && \ source /opt/venv/bin/activate && \ - pip install --upgrade --extra-index-url=https://www.piwheels.org/simple pip TheengsGateway==1.4.0 + pip install --upgrade --extra-index-url=https://www.piwheels.org/simple pip TheengsGateway==1.5.0 COPY chroot / CMD source /opt/venv/bin/activate && exec /opt/venv/start.sh diff --git a/chroot/opt/venv/start.sh b/chroot/opt/venv/start.sh index ef01872..d3c72c3 100755 --- a/chroot/opt/venv/start.sh +++ b/chroot/opt/venv/start.sh @@ -202,7 +202,8 @@ echo "Creating config at $CONFIG ..." "time_format": "${TIME_FORMAT:-0}", "ble": ${BLE:-true}, "enable_tls": ${ENABLE_TLS:-false}, - "enable_websocket": ${ENABLE_WEBSOCKET:-false} + "enable_websocket": ${ENABLE_WEBSOCKET:-false}, + "whitelist": "${WHITELIST:-[]}" EOF # Conditionally include IDENTITIES if not empty if [ -n "$IDENTITIES" ]; then diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index d7fae3e..86c3bc0 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.1' - services: theengsgateway: image: theengs/gateway:latest @@ -33,6 +31,7 @@ services: ENABLE_WEBSOCKET: false BLE: true IDENTITIES: "{}" + WHITELIST: "[]" volumes: - /var/run/dbus:/var/run/dbus From d90ac12200a41a105792196d9305a5faa9d83b35 Mon Sep 17 00:00:00 2001 From: "radim.kliment" Date: Sun, 26 Jan 2025 11:44:54 +0100 Subject: [PATCH 2/3] feat(bl): added blacklist --- chroot/opt/venv/start.sh | 3 ++- examples/docker-compose.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/chroot/opt/venv/start.sh b/chroot/opt/venv/start.sh index d3c72c3..9f53c09 100755 --- a/chroot/opt/venv/start.sh +++ b/chroot/opt/venv/start.sh @@ -203,7 +203,8 @@ echo "Creating config at $CONFIG ..." "ble": ${BLE:-true}, "enable_tls": ${ENABLE_TLS:-false}, "enable_websocket": ${ENABLE_WEBSOCKET:-false}, - "whitelist": "${WHITELIST:-[]}" + "whitelist": "${WHITELIST:-[]}", + "blacklist": "${BLACKLIST:-[]}" EOF # Conditionally include IDENTITIES if not empty if [ -n "$IDENTITIES" ]; then diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 86c3bc0..be02ef1 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -32,6 +32,7 @@ services: BLE: true IDENTITIES: "{}" WHITELIST: "[]" + BLACKLIST: "[]" volumes: - /var/run/dbus:/var/run/dbus From ec69e7d210392a32e15f7a4e187c23ce1cf30763 Mon Sep 17 00:00:00 2001 From: "radim.kliment" Date: Sun, 26 Jan 2025 16:28:04 +0100 Subject: [PATCH 3/3] feat(ver): changed version --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 4129e8f..2d5bd16 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VERSION=1.5.0 +VERSION=1.5.0.1 NON_INTERACTIVE=false BUILDX=true BUILDX_PURGE=false