Skip to content

Commit febf1d0

Browse files
smirasmira
committed
chore: bump dependencies
s/talos-systems/siderolabs/ Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 9d49478 commit febf1d0

File tree

3 files changed

+391
-105
lines changed

3 files changed

+391
-105
lines changed

‎Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
# syntax = docker/dockerfile-upstream:1.2.0
22

3-
FROM golang:1.16-alpine AS base
3+
FROM golang:1.17-alpine AS base
44
ENV GO111MODULE on
55
ENV GOPROXY https://proxy.golang.org
66
ENV CGO_ENABLED 0
7+
ENV GOCACHE /.cache/go-build
8+
ENV GOMODCACHE /.cache/mod
79
RUN apk --update --no-cache add bash curl
810
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b /bin v1.27.0
911
WORKDIR /src
1012
COPY ./go.mod ./
1113
COPY ./go.sum ./
12-
RUN go mod download
13-
RUN go mod verify
14+
RUN --mount=type=cache,target=/.cache go mod download
15+
RUN --mount=type=cache,target=/.cache go mod verify
1416
COPY ./cmd ./cmd
1517
COPY ./internal ./internal
1618
COPY ./main.go ./main.go
17-
RUN go list -mod=readonly all >/dev/null
19+
RUN --mount=type=cache,target=/.cache go list -mod=readonly all >/dev/null
1820

1921
FROM base AS build
2022
ARG VERSION
2123
ARG USERNAME
2224
ARG REGISTRY
23-
RUN --mount=type=cache,target=/root/.cache/go-build GOOS=linux CGO_ENABLED=0 \
25+
RUN --mount=type=cache,target=/.cache GOOS=linux CGO_ENABLED=0 \
2426
go build \
2527
-ldflags "-extldflags \"-static\" -s -w -X github.com/talos-systems/bldr/internal/pkg/constants.Version=${VERSION} -X github.com/talos-systems/bldr/internal/pkg/constants.DefaultOrganization=${USERNAME} -X github.com/talos-systems/bldr/internal/pkg/constants.DefaultRegistry=${REGISTRY}" \
2628
-o /bldr .
27-
RUN --mount=type=cache,target=/root/.cache/go-build GOOS=linux \
29+
RUN --mount=type=cache,target=/.cache GOOS=linux \
2830
go test -c \
2931
-ldflags "-extldflags \"-static\" -s -w -X github.com/talos-systems/bldr/internal/pkg/constants.Version=${VERSION} -X github.com/talos-systems/bldr/internal/pkg/constants.DefaultOrganization=${USERNAME} -X github.com/talos-systems/bldr/internal/pkg/constants.DefaultRegistry=${REGISTRY}" \
3032
./internal/pkg/integration
3133

3234
FROM base AS lint
3335
COPY hack/golang/golangci-lint.yaml .
34-
RUN --mount=type=cache,target=/root/.cache/go-build golangci-lint run --config golangci-lint.yaml
36+
RUN --mount=type=cache,target=/.cache golangci-lint run --config golangci-lint.yaml
3537

3638
FROM scratch AS bldr
3739
LABEL org.opencontainers.image.source https://github.com/siderolabs/bldr

‎go.mod

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,72 @@
11
module github.com/talos-systems/bldr
22

3-
go 1.16
3+
go 1.17
4+
5+
replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220224222438-c78f6963a1c0+incompatible
46

57
require (
68
github.com/Masterminds/semver v1.5.0
79
github.com/Masterminds/sprig/v3 v3.2.2
810
github.com/alessio/shellescape v1.4.1
9-
github.com/containerd/containerd v1.5.4
11+
github.com/containerd/containerd v1.6.2
1012
github.com/emicklei/dot v0.16.0
1113
github.com/google/go-github/v35 v35.3.0
1214
github.com/hashicorp/go-multierror v1.1.1
13-
github.com/moby/buildkit v0.9.0
15+
github.com/moby/buildkit v0.10.0
1416
github.com/opencontainers/go-digest v1.0.0
15-
github.com/opencontainers/image-spec v1.0.1
16-
github.com/otiai10/copy v1.6.0
17-
github.com/spf13/cobra v1.2.1
18-
github.com/stretchr/testify v1.7.0
19-
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
17+
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5
18+
github.com/otiai10/copy v1.7.0
19+
github.com/spf13/cobra v1.4.0
20+
github.com/stretchr/testify v1.7.1
21+
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a
2022
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
2123
gopkg.in/yaml.v2 v2.4.0
2224
)
25+
26+
require (
27+
github.com/Masterminds/goutils v1.1.1 // indirect
28+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
29+
github.com/agext/levenshtein v1.2.3 // indirect
30+
github.com/containerd/ttrpc v1.1.0 // indirect
31+
github.com/containerd/typeurl v1.0.2 // indirect
32+
github.com/davecgh/go-spew v1.1.1 // indirect
33+
github.com/docker/distribution v2.8.0+incompatible // indirect
34+
github.com/docker/docker v20.10.7+incompatible // indirect
35+
github.com/docker/go-connections v0.4.0 // indirect
36+
github.com/docker/go-units v0.4.0 // indirect
37+
github.com/gogo/googleapis v1.4.1 // indirect
38+
github.com/gogo/protobuf v1.3.2 // indirect
39+
github.com/golang/protobuf v1.5.2 // indirect
40+
github.com/google/go-querystring v1.0.0 // indirect
41+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
42+
github.com/google/uuid v1.3.0 // indirect
43+
github.com/hashicorp/errwrap v1.1.0 // indirect
44+
github.com/huandu/xstrings v1.3.1 // indirect
45+
github.com/imdario/mergo v0.3.12 // indirect
46+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
47+
github.com/klauspost/compress v1.15.0 // indirect
48+
github.com/kr/text v0.2.0 // indirect
49+
github.com/mitchellh/copystructure v1.0.0 // indirect
50+
github.com/mitchellh/reflectwalk v1.0.0 // indirect
51+
github.com/moby/locker v1.0.1 // indirect
52+
github.com/moby/sys/signal v0.6.0 // indirect
53+
github.com/pkg/errors v0.9.1 // indirect
54+
github.com/pmezard/go-difflib v1.0.0 // indirect
55+
github.com/shopspring/decimal v1.2.0 // indirect
56+
github.com/sirupsen/logrus v1.8.1 // indirect
57+
github.com/spf13/cast v1.3.1 // indirect
58+
github.com/spf13/pflag v1.0.5 // indirect
59+
github.com/tonistiigi/fsutil v0.0.0-20220115021204-b19f7f9cb274 // indirect
60+
go.opentelemetry.io/otel v1.4.1 // indirect
61+
go.opentelemetry.io/otel/trace v1.4.1 // indirect
62+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
63+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
64+
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
65+
golang.org/x/text v0.3.7 // indirect
66+
google.golang.org/appengine v1.6.7 // indirect
67+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
68+
google.golang.org/grpc v1.44.0 // indirect
69+
google.golang.org/protobuf v1.27.1 // indirect
70+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
71+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
72+
)

0 commit comments

Comments
 (0)