Skip to content

Commit

Permalink
Fixes after template move (#8)
Browse files Browse the repository at this point in the history
* Use just wget in Dockerfile

* Just wget in Dockerfile

* FIx tests
  • Loading branch information
Vlaaaaaaad authored Feb 23, 2020
1 parent 0368955 commit 35a1745
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
exit 1
fi
if [ "$reviewdog_return" -eq 1 ]; then
echo "reviewdog correctly returned failure: ${reviewdog_return}"
if [ "$reviewdog_return" -eq 0 ]; then
echo "reviewdog correctly returned success: ${reviewdog_return}"
else
echo "reviewdog returned ${reviewdog_return}, expected '1'. Failing..."
echo "reviewdog returned ${reviewdog_return}, expected '0'. Failing..."
exit 1
fi
Expand Down Expand Up @@ -73,10 +73,10 @@ jobs:
exit 1
fi
if [ "$reviewdog_return" -eq 1 ]; then
echo "reviewdog correctly returned failure: ${reviewdog_return}"
if [ "$reviewdog_return" -eq 0 ]; then
echo "reviewdog correctly returned success: ${reviewdog_return}"
else
echo "reviewdog returned ${reviewdog_return}, expected '1'. Failing..."
echo "reviewdog returned ${reviewdog_return}, expected '0'. Failing..."
exit 1
fi
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ ENV REVIEWDOG_VERSION=v0.9.17
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

# hadolint ignore=DL3018
RUN apk --no-cache --update add bash git curl \
RUN apk --no-cache --update add bash git \
&& rm -rf /var/cache/apk/*

RUN wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b /usr/local/bin/ ${REVIEWDOG_VERSION}

RUN curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip \
RUN wget -O - -q $(wget -q https://api.github.com/repos/terraform-linters/tflint/releases/latest -O - | grep -o -E "https://.+?_linux_amd64.zip") > tflint.zip \
&& unzip tflint.zip && rm tflint.zip \
&& install tflint /usr/local/bin/

Expand Down

0 comments on commit 35a1745

Please sign in to comment.