Merge pull request #12 from siderolabs/small-updates

Small updates

.github/workflows/ghcr.yaml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/test.yaml

@@ -6,6 +6,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Docker
         run: docker build . --file Dockerfile --tag talos-vmtoolsd:test

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.0-alpine AS builder
+FROM golang:1.22.1-alpine AS builder
 WORKDIR /build
 COPY . .
 ARG TARGETARCH
@@ -9,6 +9,7 @@ RUN go test -v ./... && \
     go vet ./... && \
     go build -ldflags="-s -w" -trimpath -o talos-vmtoolsd ./cmd/talos-vmtoolsd
 
-FROM gcr.io/distroless/static-debian10
+FROM scratch
+WORKDIR /bin
 COPY --from=builder /build/talos-vmtoolsd /bin/talos-vmtoolsd
 ENTRYPOINT ["/bin/talos-vmtoolsd"]

Makefile

@@ -1,7 +1,12 @@
 # For development only.
-# This Makefile is not being used by Dockerfile.
+# This Makefile is not being used by Dockerfile or GitHub actions.
+
+SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
 
 talos-vmtoolsd:
 	go build -ldflags="-s -w" -trimpath -o $@ ./cmd/$@
 
-.PHONY: talos-vmtoolsd
+docker-build:
+	docker buildx build . --tag talos-vmtoolsd:$(SHA) --file Dockerfile
+
+.PHONY: talos-vmtoolsd docker-build

go.mod

@@ -1,58 +1,58 @@
 module github.com/siderolabs/talos-vmtoolsd
 
-go 1.21.0
+go 1.22.1
 
 require (
-	github.com/cosi-project/runtime v0.3.6
-	github.com/golang/protobuf v1.5.3
-	github.com/siderolabs/talos/pkg/machinery v1.5.1
+	github.com/cosi-project/runtime v0.3.20
+	github.com/golang/protobuf v1.5.4
+	github.com/siderolabs/talos/pkg/machinery v1.6.7
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stellar/go-xdr v0.0.0-20211103144802-8017fc4bdfee
-	github.com/vmware/govmomi v0.30.7
+	github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2
+	github.com/vmware/govmomi v0.36.1
 	github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3
 )
 
 require (
-	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
-	github.com/ProtonMail/gopenpgp/v2 v2.7.3 // indirect
+	github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
 	github.com/adrg/xdg v0.4.0 // indirect
-	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/containerd/go-cni v1.1.9 // indirect
 	github.com/containernetworking/cni v1.1.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gertd/go-pluralize v0.2.1 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/josharian/native v1.1.0 // indirect
-	github.com/jsimonetti/rtnetlink v1.3.4 // indirect
+	github.com/jsimonetti/rtnetlink v1.4.1 // indirect
 	github.com/mdlayher/ethtool v0.1.0 // indirect
 	github.com/mdlayher/genetlink v1.3.2 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/mdlayher/socket v0.4.1 // indirect
-	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/mdlayher/socket v0.5.1 // indirect
+	github.com/opencontainers/runtime-spec v1.2.0 // indirect
+	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/siderolabs/crypto v0.4.1 // indirect
-	github.com/siderolabs/gen v0.4.6 // indirect
-	github.com/siderolabs/go-api-signature v0.2.6 // indirect
-	github.com/siderolabs/go-blockdevice v0.4.6 // indirect
+	github.com/siderolabs/crypto v0.4.4 // indirect
+	github.com/siderolabs/gen v0.4.8 // indirect
+	github.com/siderolabs/go-api-signature v0.3.2 // indirect
+	github.com/siderolabs/go-blockdevice v0.4.7 // indirect
 	github.com/siderolabs/go-pointer v1.0.0 // indirect
 	github.com/siderolabs/net v0.4.0 // indirect
-	github.com/siderolabs/protoenc v0.2.0 // indirect
-	go.uber.org/multierr v1.10.0 // indirect
-	go.uber.org/zap v1.25.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.57.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	github.com/siderolabs/protoenc v0.2.1 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
+	google.golang.org/grpc v1.62.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )