Skip to content

Commit

Permalink
Switch fatih/errwrap linter install source
Browse files Browse the repository at this point in the history
Switch from upstream project to temporary fork until the
dependencies for the project are updated to work with
newer Go versions.

refs GH-1331
  • Loading branch information
atc0005 committed Feb 6, 2024
1 parent 2dd1cc0 commit 5c41633
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions unstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ ENV GOVULNCHECK_VERSION="v1.0.3"
# ENV STRUCTSLOP_VERSION="v0.0.8"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.1.1"
ENV ERRWRAP_VERSION="v1.5.0"
# ENV ERRWRAP_VERSION="v1.5.0"

# These commits/versions are provided by temporary forks of the upstream
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="daff15ed7aa6321f4c278dedfa087c23aef2399b"
ENV STRUCTSLOP_VERSION="a152317819bb2aac2f36fbc46e92f34d4abcafc6"
ENV TICKERYZER_VERSION="ea43e9b9956c5a0bea094b694b248de37810634a"
ENV ERRWRAP_VERSION="c75521dd38c3bf43d1acaf3f628d87252fa69270"

RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
&& go install honnef.co/go/tools/cmd/staticcheck@${STATICCHECK_VERSION} \
Expand All @@ -58,9 +59,7 @@ RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
RUN echo "Installing govulncheck@${GOVULNCHECK_VERSION}" \
&& go install golang.org/x/vuln/cmd/govulncheck@${GOVULNCHECK_VERSION} \
&& echo "Installing tomll@${TOMLL_VERSION}" \
&& go install github.com/pelletier/go-toml/v2/cmd/tomll@${TOMLL_VERSION} \
&& echo "Installing errwrap@${ERRWRAP_VERSION}" \
&& go install github.com/fatih/errwrap@${ERRWRAP_VERSION}
&& go install github.com/pelletier/go-toml/v2/cmd/tomll@${TOMLL_VERSION}

RUN echo "Installing httperroryzer from temporary fork" \
&& git clone https://github.com/atc0005/httperroryzer \
Expand All @@ -83,6 +82,13 @@ RUN echo "Installing tickeryzer from temporary fork" \
&& go install ./cmd/tickeryzer \
&& cd ..

RUN echo "Installing errwrap from temporary fork" \
&& git clone https://github.com/atc0005/errwrap \
&& cd errwrap \
&& git checkout ${ERRWRAP_VERSION} \
&& go install ./cmd/errwrap \
&& cd ..

# RUN echo "Installing golangci-lint from dev feat/go1.20 branch" \
# && git clone https://github.com/atc0005/golangci-lint \
# && cd golangci-lint \
Expand Down

0 comments on commit 5c41633

Please sign in to comment.