Skip to content

Commit 1045276

Browse files
committed
change: update email and fix tools
1 parent 9c9d147 commit 1045276

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement at
63-
63+
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2019-2022 Thorsten Klein <[email protected]>
3+
Copyright © 2019-2022 Thorsten Klein <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,12 @@ endif
220220
# - gox for cross-compilation (build-cross)
221221
# - kubectl for E2E-tests (e2e)
222222
ci-setup:
223-
@echo "Installing Go tools..."
223+
@echo "### Installing Go tools..."
224+
@echo "### -> Installing golangci-lint..."
224225
curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b $(GOENVPATH)/bin v$(PKG_GOLANGCI_LINT_VERSION)
225-
$(GO) get $(PKG_GOX)
226226

227-
@echo "Installing kubectl..."
227+
@echo "### -> Installing gox..."
228+
./scripts/install-tools.sh gox
229+
230+
@echo "### Installing kubectl..."
228231
./scripts/install-tools.sh kubectl

scripts/install-tools.sh

+11-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,16 @@ install_yq() {
4545

4646
install_golangci_lint() {
4747
echo "Installing golangci-lint..."
48-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0
48+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
49+
}
50+
51+
install_gox() {
52+
echo "Installing gox for $OS/$ARCH..."
53+
GOX_REPO=iwilltry42/gox
54+
GOX_VERSION=0.1.0
55+
curl -sSfL https://github.com/${GOX_REPO}/releases/download/v${GOX_VERSION}/gox_${GOX_VERSION}_${OS}_${ARCH}.tar.gz | tar -xz -C /tmp
56+
chmod +x /tmp/gox
57+
mv /tmp/gox /usr/local/bin/gox
4958
}
5059

5160
install_confd() {
@@ -71,6 +80,7 @@ for pkg in "$@"; do
7180
yq) install_yq;;
7281
golangci-lint) install_golangci_lint;;
7382
confd) install_confd;;
83+
gox) install_gox;;
7484
*) printf "ERROR: Unknown Package '%s'" $pkg;;
7585
esac
7686
done

tools/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ENV GO111MODULE=on
88
ENV CGO_ENABLED=0
99
RUN make build
1010

11-
FROM alpine:3.13
11+
FROM alpine:3.16
1212
RUN apk update && apk add bash
1313
WORKDIR /app
1414
COPY --from=builder /app/bin/k3d-tools .

0 commit comments

Comments
 (0)