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

Whitelist, blacklist feature #18

Merged
merged 3 commits into from
Jan 26, 2025
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=1.4.0.1
VERSION=1.5.0
1technophile marked this conversation as resolved.
Show resolved Hide resolved
NON_INTERACTIVE=false
BUILDX=true
BUILDX_PURGE=false
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion chroot/opt/venv/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,9 @@ 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:-[]}",
"blacklist": "${BLACKLIST:-[]}"
EOF
# Conditionally include IDENTITIES if not empty
if [ -n "$IDENTITIES" ]; then
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.1'

services:
theengsgateway:
image: theengs/gateway:latest
Expand Down Expand Up @@ -33,6 +31,8 @@ services:
ENABLE_WEBSOCKET: false
BLE: true
IDENTITIES: "{}"
WHITELIST: "[]"
BLACKLIST: "[]"

volumes:
- /var/run/dbus:/var/run/dbus