This commit is contained in:
Pascal Vizeli
2019-04-24 16:38:29 +02:00
parent ac34f421e2
commit 22a5402b2c
4 changed files with 23 additions and 7 deletions

6
.hadolint.yaml Normal file
View File

@@ -0,0 +1,6 @@
ignored:
- DL3003
- DL3006
- DL3007
- DL3008
- DL3018

View File

@@ -44,3 +44,14 @@ jobs:
-v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) **/*.sh -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) **/*.sh
displayName: 'Run ShellCheck' displayName: 'Run ShellCheck'
- job: 'JQ'
pool:
vmImage: 'ubuntu-16.04'
steps:
- script: sudo apt-get install -y jq
displayName: 'Install JQ'
- bash: |
shopt -s globstar
cat **/*.json | jq '.'
displayName: 'Run JQ'

View File

@@ -1,12 +1,12 @@
ARG BUILD_FROM ARG BUILD_FROM
FROM $BUILD_FROM FROM $BUILD_FROM
# Add env
ENV LANG C.UTF-8
WORKDIR /usr/src WORKDIR /usr/src
ARG BUILD_ARCH ARG BUILD_ARCH
# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
## ##
# RPi support for HDMI-CEC on armhf/aarch64 # RPi support for HDMI-CEC on armhf/aarch64
RUN if [ "$BUILD_ARCH" == "armhf" ] || [ "$BUILD_ARCH" == "aarch64" ]; then \ RUN if [ "$BUILD_ARCH" == "armhf" ] || [ "$BUILD_ARCH" == "aarch64" ]; then \

View File

@@ -1,6 +1,7 @@
#!/usr/bin/env bashio #!/usr/bin/env bashio
set -e set -e
# shellcheck disable=SC1091
. /discovery.sh . /discovery.sh
WAIT_PIDS=() WAIT_PIDS=()
@@ -9,8 +10,6 @@ WAIT_PIDS=()
DECONZ_DEVICE=$(bashio::config 'device') DECONZ_DEVICE=$(bashio::config 'device')
API_PORT=$(bashio::addon.port 80) API_PORT=$(bashio::addon.port 80)
WEBSOCKET_PORT=$(bashio::addon.port 8080) WEBSOCKET_PORT=$(bashio::addon.port 8080)
INGRESS_PORT=$(bashio::addon.ingress_port)
INGRESS_INTERFACE=$(bashio::addon.ip_address)
# Check if port is available # Check if port is available
if [ -z "${API_PORT}" ] || [ -z "${WEBSOCKET_PORT}" ]; then if [ -z "${API_PORT}" ] || [ -z "${WEBSOCKET_PORT}" ]; then
@@ -27,8 +26,8 @@ deCONZ \
--dbg-zcl=0 \ --dbg-zcl=0 \
--dbg-zdp=0 \ --dbg-zdp=0 \
--dbg-otau=0 \ --dbg-otau=0 \
--http-port=${API_PORT} \ --http-port="${API_PORT}" \
--ws-port=${WEBSOCKET_PORT} \ --ws-port="${WEBSOCKET_PORT}" \
--upnp=0 \ --upnp=0 \
--dev="${DECONZ_DEVICE}" & --dev="${DECONZ_DEVICE}" &
WAIT_PIDS+=($!) WAIT_PIDS+=($!)