diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 811484103..642339da2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.1 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }} @@ -83,7 +83,7 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.golang }} - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.1 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbc05b85e..4c7f9deb0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - name: Cache Go modules if: steps.semantic.outputs.new-release-published == 'true' && steps.repoman.outputs.has-go-binary == 'true' - uses: actions/cache@v3.2.6 + uses: actions/cache@v3.3.1 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ matrix.golang }}-v1-${{ hashFiles('**/go.sum') }} diff --git a/Dockerfile b/Dockerfile index f4529bbfe..47a7f0dd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VCS_REF ARG VERSION # build -FROM golang:1.19.2-alpine as builder +FROM golang:1.21.0-alpine as builder RUN apk add --no-cache git gcc musl-dev make ENV GO111MODULE=on WORKDIR /go/src/moul.io/assh @@ -14,7 +14,7 @@ COPY . ./ RUN make install # minimalist runtime -FROM alpine:3.16.0 +FROM alpine:3.18.3 LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.name="assh" \ org.label-schema.description="" \ diff --git a/go.mod b/go.mod index 1f2d03b26..bf6057fac 100644 --- a/go.mod +++ b/go.mod @@ -12,15 +12,15 @@ require ( github.com/docker/docker v1.13.1 // indirect github.com/docker/go-units v0.5.0 github.com/docker/libcompose v0.4.0 - github.com/dustin/go-humanize v1.0.0 + github.com/dustin/go-humanize v1.0.1 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 - github.com/gin-gonic/gin v1.7.7 + github.com/gin-gonic/gin v1.9.1 github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3 // indirect github.com/haklop/gnotifier v0.0.0-20140909091139-0de36badf601 github.com/huandu/xstrings v1.3.1 // indirect - github.com/imdario/mergo v0.3.12 + github.com/imdario/mergo v0.3.16 github.com/mattn/go-colorable v0.1.6 // indirect - github.com/mattn/go-zglob v0.0.3 + github.com/mattn/go-zglob v0.0.4 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d github.com/mitchellh/copystructure v1.0.0 // indirect github.com/mitchellh/reflectwalk v1.0.1 // indirect @@ -28,16 +28,16 @@ require ( github.com/moul/flexyaml v0.0.0-20171225152558-f458bfa8afe2 github.com/pkg/errors v0.9.1 github.com/shirou/gopsutil v3.21.11+incompatible - github.com/smartystreets/goconvey v1.7.2 - github.com/spf13/cobra v1.4.0 + github.com/smartystreets/goconvey v1.8.1 + github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.8.1 + github.com/spf13/viper v1.16.0 github.com/tklauser/go-sysconf v0.3.9 // indirect - github.com/urfave/cli v1.22.9 + github.com/urfave/cli v1.22.14 github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 - golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 - golang.org/x/text v0.3.5 - golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e + go.uber.org/zap v1.25.0 + golang.org/x/crypto v0.12.0 + golang.org/x/net v0.14.0 + golang.org/x/text v0.12.0 + golang.org/x/time v0.3.0 )