Skip to content

Commit 2c83d79

Browse files
supersebsuperseb
authored
Merge pull request #85 from superseb/update_golang
Switch to bci golang 1.18
2 parents 8644abf + 6d8c6bc commit 2c83d79

File tree

3 files changed

+757
-547
lines changed

3 files changed

+757
-547
lines changed

‎Dockerfile.dapper‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
FROM golang:1.15.10-alpine3.13
1+
FROM registry.suse.com/bci/golang:1.18
22

33
ARG DAPPER_HOST_ARCH
44
ENV ARCH $DAPPER_HOST_ARCH
55

6-
RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates make patch
7-
RUN go get -d golang.org/x/lint/golint && \
8-
git -C /go/src/golang.org/x/lint/golint checkout -b current 06c8688daad7faa9da5a0c2f163a3d14aac986ca && \
9-
go install golang.org/x/lint/golint && \
10-
rm -rf /go/src /go/pkg
11-
RUN mkdir -p /go/src/golang.org/x && \
12-
cd /go/src/golang.org/x && git clone https://github.com/golang/tools && \
13-
git -C /go/src/golang.org/x/tools checkout -b current aa82965741a9fecd12b026fbb3d3c6ed3231b8f8 && \
14-
go install golang.org/x/tools/cmd/goimports
15-
RUN rm -rf /go/src /go/pkg
6+
RUN zypper -n in git-core curl tar gzip docker wget awk hostname make patch docker && \
7+
zypper -n clean -a && \
8+
rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages/*
9+
1610
RUN if [ "${ARCH}" == "amd64" ]; then \
17-
curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.27.0; \
11+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.47.3; \
1812
fi
1913

2014
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS

‎go.mod‎

Lines changed: 148 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,159 @@
11
module github.com/rancher/charts-build-scripts
22

3-
go 1.16
3+
go 1.18
44

5-
replace (
6-
// Needed to resolve issue on Darwin machines
7-
// https://github.com/ory/dockertest/issues/208#issuecomment-686820414
8-
golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
9-
k8s.io/client-go => k8s.io/client-go v0.19.0
5+
// Needed to resolve issue on Darwin machines
6+
// https://github.com/ory/dockertest/issues/208#issuecomment-686820414
7+
// golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
8+
replace k8s.io/client-go => k8s.io/client-go v0.24.3
9+
10+
require (
11+
github.com/blang/semver v3.5.1+incompatible
12+
github.com/go-git/go-billy/v5 v5.3.1
13+
github.com/go-git/go-git/v5 v5.4.2
14+
github.com/sirupsen/logrus v1.8.1
15+
github.com/urfave/cli v1.22.9
16+
gopkg.in/yaml.v2 v2.4.0
17+
helm.sh/helm/v3 v3.9.1
18+
sigs.k8s.io/yaml v1.3.0
1019
)
1120

1221
require (
13-
github.com/Microsoft/go-winio v0.4.16 // indirect
14-
github.com/blang/semver v3.5.0+incompatible
15-
github.com/go-git/go-billy/v5 v5.0.0
16-
github.com/go-git/go-git/v5 v5.2.0
17-
github.com/golang/protobuf v1.4.3 // indirect
18-
github.com/imdario/mergo v0.3.11 // indirect
22+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
23+
github.com/BurntSushi/toml v1.0.0 // indirect
24+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
25+
github.com/Masterminds/goutils v1.1.1 // indirect
26+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
27+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
28+
github.com/Masterminds/squirrel v1.5.3 // indirect
29+
github.com/Microsoft/go-winio v0.5.1 // indirect
30+
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
31+
github.com/PuerkitoBio/purell v1.1.1 // indirect
32+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
33+
github.com/acomagu/bufpipe v1.0.3 // indirect
34+
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
35+
github.com/beorn7/perks v1.0.1 // indirect
36+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
37+
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
38+
github.com/containerd/containerd v1.6.6 // indirect
39+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
40+
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
41+
github.com/davecgh/go-spew v1.1.1 // indirect
42+
github.com/docker/cli v20.10.17+incompatible // indirect
43+
github.com/docker/distribution v2.8.1+incompatible // indirect
44+
github.com/docker/docker v20.10.17+incompatible // indirect
45+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
46+
github.com/docker/go-connections v0.4.0 // indirect
47+
github.com/docker/go-metrics v0.0.1 // indirect
48+
github.com/docker/go-units v0.4.0 // indirect
49+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
50+
github.com/emirpasic/gods v1.12.0 // indirect
51+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
52+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
53+
github.com/fatih/color v1.13.0 // indirect
54+
github.com/go-errors/errors v1.0.1 // indirect
55+
github.com/go-git/gcfg v1.5.0 // indirect
56+
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
57+
github.com/go-logr/logr v1.2.2 // indirect
58+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
59+
github.com/go-openapi/jsonreference v0.19.5 // indirect
60+
github.com/go-openapi/swag v0.19.14 // indirect
61+
github.com/gobwas/glob v0.2.3 // indirect
62+
github.com/gogo/protobuf v1.3.2 // indirect
63+
github.com/golang/protobuf v1.5.2 // indirect
64+
github.com/google/btree v1.0.1 // indirect
65+
github.com/google/gnostic v0.5.7-v3refs // indirect
66+
github.com/google/go-cmp v0.5.6 // indirect
67+
github.com/google/gofuzz v1.2.0 // indirect
68+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
69+
github.com/google/uuid v1.2.0 // indirect
70+
github.com/gorilla/mux v1.8.0 // indirect
71+
github.com/gosuri/uitable v0.0.4 // indirect
72+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
73+
github.com/huandu/xstrings v1.3.2 // indirect
74+
github.com/imdario/mergo v0.3.12 // indirect
75+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
76+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
77+
github.com/jmoiron/sqlx v1.3.5 // indirect
78+
github.com/josharian/intern v1.0.0 // indirect
79+
github.com/json-iterator/go v1.1.12 // indirect
1980
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
81+
github.com/klauspost/compress v1.13.6 // indirect
82+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
83+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
84+
github.com/lib/pq v1.10.6 // indirect
85+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
86+
github.com/mailru/easyjson v0.7.6 // indirect
87+
github.com/mattn/go-colorable v0.1.12 // indirect
88+
github.com/mattn/go-isatty v0.0.14 // indirect
89+
github.com/mattn/go-runewidth v0.0.9 // indirect
90+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
91+
github.com/mitchellh/copystructure v1.2.0 // indirect
92+
github.com/mitchellh/go-homedir v1.1.0 // indirect
93+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
94+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
95+
github.com/moby/locker v1.0.1 // indirect
96+
github.com/moby/spdystream v0.2.0 // indirect
97+
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
98+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
99+
github.com/modern-go/reflect2 v1.0.2 // indirect
100+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
101+
github.com/morikuni/aec v1.0.0 // indirect
102+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103+
github.com/onsi/gomega v1.17.0 // indirect
104+
github.com/opencontainers/go-digest v1.0.0 // indirect
105+
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
106+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
107+
github.com/pkg/errors v0.9.1 // indirect
108+
github.com/pmezard/go-difflib v1.0.0 // indirect
109+
github.com/prometheus/client_golang v1.12.1 // indirect
110+
github.com/prometheus/client_model v0.2.0 // indirect
111+
github.com/prometheus/common v0.32.1 // indirect
112+
github.com/prometheus/procfs v0.7.3 // indirect
113+
github.com/rubenv/sql-migrate v1.1.1 // indirect
114+
github.com/russross/blackfriday v1.5.2 // indirect
20115
github.com/russross/blackfriday/v2 v2.1.0 // indirect
21-
github.com/sirupsen/logrus v1.7.0
22-
github.com/urfave/cli v1.22.5
116+
github.com/sergi/go-diff v1.1.0 // indirect
117+
github.com/shopspring/decimal v1.2.0 // indirect
118+
github.com/spf13/cast v1.4.1 // indirect
119+
github.com/spf13/cobra v1.4.0 // indirect
120+
github.com/spf13/pflag v1.0.5 // indirect
121+
github.com/stretchr/testify v1.7.2 // indirect
23122
github.com/xanzy/ssh-agent v0.3.0 // indirect
24-
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect
25-
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 // indirect
26-
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect
27-
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e // indirect
123+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
124+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
125+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
126+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
127+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
128+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
129+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
130+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
131+
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
132+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
133+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
134+
golang.org/x/text v0.3.7 // indirect
135+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
28136
google.golang.org/appengine v1.6.7 // indirect
29-
gopkg.in/yaml.v2 v2.4.0
30-
helm.sh/helm/v3 v3.4.2
31-
rsc.io/letsencrypt v0.0.3 // indirect
32-
sigs.k8s.io/yaml v1.2.0
137+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
138+
google.golang.org/grpc v1.43.0 // indirect
139+
google.golang.org/protobuf v1.27.1 // indirect
140+
gopkg.in/inf.v0 v0.9.1 // indirect
141+
gopkg.in/warnings.v0 v0.1.2 // indirect
142+
gopkg.in/yaml.v3 v3.0.1 // indirect
143+
k8s.io/api v0.24.3 // indirect
144+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
145+
k8s.io/apimachinery v0.24.3 // indirect
146+
k8s.io/apiserver v0.24.2 // indirect
147+
k8s.io/cli-runtime v0.24.2 // indirect
148+
k8s.io/client-go v0.24.2 // indirect
149+
k8s.io/component-base v0.24.2 // indirect
150+
k8s.io/klog/v2 v2.60.1 // indirect
151+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
152+
k8s.io/kubectl v0.24.2 // indirect
153+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
154+
oras.land/oras-go v1.2.0 // indirect
155+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
156+
sigs.k8s.io/kustomize/api v0.11.4 // indirect
157+
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
158+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
33159
)

0 commit comments

Comments
 (0)