diff --git a/.github/linters/.hadolint.yaml b/.github/linters/.hadolint.yaml index d896baa..8df7f35 100644 --- a/.github/linters/.hadolint.yaml +++ b/.github/linters/.hadolint.yaml @@ -14,11 +14,14 @@ ignored: - DL3018 #apk add pin versions - DL3019 #don't worry about avoiding cache in build-only stages - DL3022 #bad rule for COPY --from + - DL3025 #for this image, we don't want JSON in CMD - DL3028 #gem install pin versions - DL3044 #putting arg in env is fine. False positive. - DL3059 #multiple consecutive runs - DL4006 #we don't need pipefail in this + - SC1083 # {} is ok in kubectl commands - SC2016 #we want single quotes sometimes + - SC2046 #we don't always quote sometimes # FULL TEMPLATE diff --git a/shpod.sh b/shpod.sh index de0f424..e06b27a 100755 --- a/shpod.sh +++ b/shpod.sh @@ -1,4 +1,5 @@ #!/bin/sh +# shellcheck disable=SC2083,SC2086 # For more information about shpod, check it out on GitHub: # https://github.com/bretfisher/shpod if [ -f shpod.yaml ]; then @@ -6,7 +7,6 @@ if [ -f shpod.yaml ]; then else YAML=https://k8smastery.com/shpod.yaml fi -# shellcheck disable=SC2083 if [ "$(kubectl get pod --namespace=shpod shpod --ignore-not-found -o jsonpath={.status.phase})" = "Running" ]; then echo "Shpod is already running. Starting a new shell with 'kubectl exec'." echo "(Note: if the main invocation of shpod exits, all others will be terminated.)"