Cleanup forked linter version details

- update README to explicitly list commits for forked linter
  repos
- update ENV var values for `builder` and `final` images to
  specify forked linter repo commit instead of latest upstream
  version tag (which doesn't match the custom build)

refs GH-1585
refs GH-1328
refs GH-1363
refs GH-1400

README.md

@@ -72,17 +72,25 @@ others.
 Unless indicated otherwise, the following linting tools are included in the
 `go-ci-stable`, `go-ci-oldstable` and `go-ci-unstable` images:
 
-| Linter                                                                | Version                               |
-| --------------------------------------------------------------------- | ------------------------------------- |
-| [`staticcheck`](https://github.com/dominikh/go-tools)                 | `2023.1.7` (`v0.4.7`)                 |
-| [`golangci-lint`](https://github.com/golangci/golangci-lint)          | `v1.59.1`                             |
-| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.2`                              |
-| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode)      | `v0.22.0`                             |
-| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1`                              |
-| [`orijtech/structslop`](https://github.com/orijtech/structslop)       | `v0.0.8` (`oldstable`, `stable` only) |
-| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer)       | `v0.0.3`                              |
-| [`pelletier/go-toml`](https://github.com/pelletier/go-toml)           | `v2.2.2`                              |
-| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.6.0`                              |
+| Linter                                                                | Version                     |
+| --------------------------------------------------------------------- | --------------------------- |
+| [`staticcheck`](https://github.com/dominikh/go-tools)                 | `2023.1.7` (`v0.4.7`)       |
+| [`golangci-lint`](https://github.com/golangci/golangci-lint)          | `v1.59.1`                   |
+| [`govulncheck`](https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck) | `v1.1.2`                    |
+| [`deadcode`](https://pkg.go.dev/golang.org/x/tools/cmd/deadcode)      | `v0.22.0`                   |
+| [`orijtech/httperroryzer`](https://github.com/orijtech/httperroryzer) | `v0.0.1` (`oldstable` only) |
+| [`orijtech/structslop`](https://github.com/orijtech/structslop)       | `v0.0.8` (`oldstable` only) |
+| [`orijtech/tickeryzer`](https://github.com/orijtech/tickeryzer)       | `v0.0.3` (`oldstable` only) |
+| [`pelletier/go-toml`](https://github.com/pelletier/go-toml)           | `v2.2.2`                    |
+| [`fatih/errwrap`](https://github.com/fatih/errwrap)                   | `v1.6.0`                    |
+
+Forks:
+
+| Linter                                                               | Version                                                                |
+| -------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| [`orijtech/httperroryzer`](https://github.com/atc0005/httperroryzer) | `54c26d99b9758117957285a790c2d88b51a552dd` (`stable`, `unstable` only) |
+| [`orijtech/structslop`](https://github.com/atc0005/structslop)       | `55db8be618045ec870098a4579bae376bbb7df33` (`stable` only)             |
+| [`orijtech/tickeryzer`](https://github.com/atc0005/tickeryzer)       | `66a42ca5c152aced76c5186e92a4ae653440f02d` (`stable`, `unstable` only) |
 
 ## Build tools included
 

stable/combined/Dockerfile

@@ -19,9 +19,9 @@ ENV GOLANGCI_LINT_VERSION="v1.59.1"
 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 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"
 ENV GOTESTDOX_VERSION="v0.2.2"
@@ -126,13 +126,20 @@ LABEL org.opencontainers.image.authors="Adam Chalkley (github.com/atc0005)"
 # https://github.com/atc0005/go-ci/issues/1188
 ENV GOTOOLCHAIN="local"
 
+# 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="54c26d99b9758117957285a790c2d88b51a552dd"
+ENV STRUCTSLOP_VERSION="55db8be618045ec870098a4579bae376bbb7df33"
+ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"
+
 ENV GOLANGCI_LINT_VERSION="v1.59.1"
 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 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"
 ENV GOTESTDOX_VERSION="v0.2.2"

unstable/combined/Dockerfile

@@ -130,9 +130,15 @@ ENV GOLANGCI_LINT_VERSION="v1.59.1"
 # the latest upstream build of the tool is installed in this image.
 ENV STATICCHECK_VERSION="v0.4.7"
 
+# 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="54c26d99b9758117957285a790c2d88b51a552dd"
+ENV TICKERYZER_VERSION="66a42ca5c152aced76c5186e92a4ae653440f02d"
+
 ENV DEADCODE_VERSION="v0.22.0"
 ENV GOVULNCHECK_VERSION="v1.1.2"
-ENV HTTPERRORYZER_VERSION="v0.0.1"
+# ENV HTTPERRORYZER_VERSION="v0.0.1"
 ENV TOMLL_VERSION="v2.2.2"
 ENV ERRWRAP_VERSION="v1.6.0"
 ENV GOTESTDOX_VERSION="v0.2.2"