Skip to content

Commit

Permalink
Use go install for dep binaries when building docker (#5858)
Browse files Browse the repository at this point in the history
Update the way our docker build script installs the binaries we rely on
at runtime to avoid "go get" deprecation warnings.

Fixes #5744
  • Loading branch information
beautifulentropy committed Dec 17, 2021
1 parent c46003c commit 8a1b51f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/boulder-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
matrix:
# Add additional docker image tags here and all tests will be run with the additional image.
BOULDER_TOOLS_TAG:
- go1.17_2021-12-10
- go1.17.5_2021-12-10
- go1.17_2021-12-16
- go1.17.5_2021-12-16
# Tests command definitions. Use the entire docker-compose command you want to run.
tests:
# Run ./test.sh --help for a description of each of the flags.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
boulder:
image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-12-10}
image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.17_2021-12-16}
environment:
FAKE_DNS: 10.77.77.77
BOULDER_CONFIG_DIR: test/config
Expand Down
14 changes: 5 additions & 9 deletions test/boulder-tools/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,11 @@ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/insta
# Note: The version of golang/protobuf is partially tied to the version of grpc
# used by Boulder overall. Updating it may require updating the grpc version
# and vice versa.
GO111MODULE=on go get \
bitbucket.org/liamstask/goose/cmd/goose \
google.golang.org/protobuf/cmd/protoc-gen-go@v1.26.0 \
google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0 \
golang.org/x/tools/cmd/stringer

# Pebble's latest version is v2+, but it's not properly go mod compatible, so we
# fetch it in GOPATH mode.
GO111MODULE=off go get github.com/letsencrypt/pebble/cmd/pebble-challtestsrv
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26.0
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
go install bitbucket.org/liamstask/goose/cmd/goose@latest
go install golang.org/x/tools/cmd/stringer@latest
go install github.com/letsencrypt/pebble/cmd/pebble-challtestsrv@master

go clean -cache
go clean -modcache
Expand Down

0 comments on commit 8a1b51f

Please sign in to comment.