Skip to content

Commit

Permalink
Remove orijtech/structslop from unstable image
Browse files Browse the repository at this point in the history
The latest upstream version of this linter fails to build
using Go 1.23rc1. The linter is retained in the oldstable
and stable images for now as the forked/patched version
continues to build using Go 1.21 and Go 1.22.

refs GH-1585
refs GH-1583
  • Loading branch information
atc0005 committed Jun 24, 2024
1 parent 632c286 commit 740aff5
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions unstable/combined/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ ENV STATICCHECK_VERSION="v0.4.7"
ENV DEADCODE_VERSION="v0.22.0"
ENV GOVULNCHECK_VERSION="v1.1.2"
# ENV HTTPERRORYZER_VERSION="v0.0.1"
# ENV STRUCTSLOP_VERSION="v0.0.8"
# ENV TICKERYZER_VERSION="v0.0.3"
ENV TOMLL_VERSION="v2.2.2"
ENV ERRWRAP_VERSION="v1.6.0"
Expand All @@ -37,7 +36,6 @@ ENV GOTESTDOX_VERSION="v0.2.2"
# projects. The plan is to switch back to current upstream vesions once
# the required dependencies are updated for those upstream projects.
ENV HTTPERRORYZER_VERSION="54c26d99b9758117957285a790c2d88b51a552dd"
ENV STRUCTSLOP_VERSION="55db8be618045ec870098a4579bae376bbb7df33"
ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"
# ENV ERRWRAP_VERSION="c75521dd38c3bf43d1acaf3f628d87252fa69270"

Expand All @@ -49,8 +47,6 @@ RUN echo "Installing staticcheck@${STATICCHECK_VERSION}" \
# && go install golang.org/x/vuln/cmd/govulncheck@${GOVULNCHECK_VERSION} \
# && echo "Installing httperroryzer@${HTTPERRORYZER_VERSION}" \
# && go install github.com/orijtech/httperroryzer/cmd/httperroryzer@${HTTPERRORYZER_VERSION} \
# && echo "Installing structslop@${STRUCTSLOP_VERSION}" \
# && go install github.com/orijtech/structslop/cmd/structslop@${STRUCTSLOP_VERSION} \
# && echo "Installing tickeryzer@${TICKERYZER_VERSION}" \
# && go install github.com/orijtech/tickeryzer/cmd/tickeryzer@${TICKERYZER_VERSION} \
# && echo "Installing tomll@${TOMLL_VERSION}" \
Expand All @@ -74,13 +70,6 @@ RUN echo "Installing httperroryzer from temporary fork" \
&& go install ./cmd/httperroryzer \
&& cd ..

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

RUN echo "Installing tickeryzer from temporary fork" \
&& git clone https://github.com/atc0005/tickeryzer \
&& cd tickeryzer \
Expand Down Expand Up @@ -144,7 +133,6 @@ ENV STATICCHECK_VERSION="v0.4.7"
ENV DEADCODE_VERSION="v0.22.0"
ENV GOVULNCHECK_VERSION="v1.1.2"
ENV HTTPERRORYZER_VERSION="v0.0.1"
ENV STRUCTSLOP_VERSION="v0.0.8"
ENV TOMLL_VERSION="v2.2.2"
ENV ERRWRAP_VERSION="v1.6.0"
ENV GOTESTDOX_VERSION="v0.2.2"
Expand All @@ -165,7 +153,6 @@ COPY --from=builder /go/bin/govulncheck /usr/bin/govulncheck
COPY --from=builder /go/bin/deadcode /usr/bin/deadcode
COPY --from=builder /go/bin/gotestdox /usr/bin/gotestdox
COPY --from=builder /go/bin/httperroryzer /usr/bin/httperroryzer
COPY --from=builder /go/bin/structslop /usr/bin/structslop
COPY --from=builder /go/bin/tickeryzer /usr/bin/tickeryzer
COPY --from=builder /go/bin/tomll /usr/bin/tomll
COPY --from=builder /go/bin/errwrap /usr/bin/errwrap
Expand Down

0 comments on commit 740aff5

Please sign in to comment.