Skip to content

Commit

Permalink
bump versions (#252)
Browse files Browse the repository at this point in the history
* bump Go and Linter version; update vulnarable packages

* update bats testing image

* fix bats tests location
  • Loading branch information
alexei-led committed Sep 7, 2023
1 parent eeedb55 commit 31655d6
Show file tree
Hide file tree
Showing 12 changed files with 689 additions and 340 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.21

- name: lint and test
shell: sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
container: golang:1.19-alpine
container: golang:1.21-alpine

steps:
- name: checkout
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ release: clean ; $(info $(M) building binaries for multiple os/arch...) @ ## Bui
setup-tools: setup-lint setup-gocov setup-gocov-xml setup-go-junit-report

setup-lint:
$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
setup-gocov:
$(GO) install github.com/axw/gocov/gocov@v1.1.0
setup-gocov-xml:
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# ----- Go Builder Image ------
#
FROM --platform=$BUILDPLATFORM golang:1.19 AS builder
FROM --platform=$BUILDPLATFORM golang:1.21 AS builder

# curl git bash
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -60,7 +60,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build make build TARGETOS=${TARGET
#
# ------ Pumba Integration Tests ------
#
FROM --platform=$TARGETPLATFORM bats/bats:1.8.2 as integration-tests
FROM --platform=$TARGETPLATFORM bats/bats:v1.10.0 as integration-tests

# install required packages
RUN apk add --no-cache docker iproute2
Expand All @@ -74,7 +74,7 @@ COPY --from=build-and-test /go/src/pumba/.bin/github.com/alexei-led/pumba /usr/l

# mount docker.sock and run pumba tests
ENTRYPOINT [ "bash", "-c" ]
CMD [ "[ -e /var/run/docker.sock ] && bats --print-output-on-failure /tests" ]
CMD [ "[ -e /var/run/docker.sock ] && bats --print-output-on-failure /code/tests" ]

#
# ------ Pumba release Docker image ------
Expand Down
41 changes: 20 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@
module github.com/alexei-led/pumba

require (
github.com/docker/docker v20.10.10+incompatible
github.com/docker/docker v23.0.3+incompatible
github.com/docker/go-connections v0.4.0
github.com/johntdyer/slackrus v0.0.0-20210521205746-42486fb4c48c
github.com/opencontainers/image-spec v1.0.2
github.com/opencontainers/image-spec v1.1.0-rc4
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.1
github.com/urfave/cli v1.22.10
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.12
golang.org/x/sync v0.3.0
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/containerd/containerd v1.5.16 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.0+incompatible // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/johntdyer/slack-go v0.0.0-20180213144715-95fac1160b22 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/net v0.0.0-20211111083644-e5c967477495 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/grpc v1.33.2 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/time v0.1.0 // indirect
golang.org/x/tools v0.13.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.0.2 // indirect
)

go 1.19
go 1.21
Loading

0 comments on commit 31655d6

Please sign in to comment.