Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
pvizeli committed Apr 24, 2019
1 parent ac34f42 commit 22a5402
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ignored:
- DL3003
- DL3006
- DL3007
- DL3008
- DL3018
11 changes: 11 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,14 @@ jobs:
-v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) **/*.sh
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'
6 changes: 3 additions & 3 deletions cec_scan/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG BUILD_FROM
FROM $BUILD_FROM

# Add env
ENV LANG C.UTF-8

WORKDIR /usr/src
ARG BUILD_ARCH

# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]

##
# RPi support for HDMI-CEC on armhf/aarch64
RUN if [ "$BUILD_ARCH" == "armhf" ] || [ "$BUILD_ARCH" == "aarch64" ]; then \
Expand Down
7 changes: 3 additions & 4 deletions deconz/data/run.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bashio
set -e

# shellcheck disable=SC1091
. /discovery.sh

WAIT_PIDS=()
Expand All @@ -9,8 +10,6 @@ WAIT_PIDS=()
DECONZ_DEVICE=$(bashio::config 'device')
API_PORT=$(bashio::addon.port 80)
WEBSOCKET_PORT=$(bashio::addon.port 8080)
INGRESS_PORT=$(bashio::addon.ingress_port)
INGRESS_INTERFACE=$(bashio::addon.ip_address)

# Check if port is available
if [ -z "${API_PORT}" ] || [ -z "${WEBSOCKET_PORT}" ]; then
Expand All @@ -27,8 +26,8 @@ deCONZ \
--dbg-zcl=0 \
--dbg-zdp=0 \
--dbg-otau=0 \
--http-port=${API_PORT} \
--ws-port=${WEBSOCKET_PORT} \
--http-port="${API_PORT}" \
--ws-port="${WEBSOCKET_PORT}" \
--upnp=0 \
--dev="${DECONZ_DEVICE}" &
WAIT_PIDS+=($!)
Expand Down

0 comments on commit 22a5402

Please sign in to comment.