change: update email and fix tools

pull/1137/head
iwilltry42 2 years ago
parent 9c9d147c77
commit 10452764e1
No known key found for this signature in database
GPG Key ID: FD4E78FBAD6B1550
  1. 2
      CODE_OF_CONDUCT.md
  2. 2
      LICENSE
  3. 9
      Makefile
  4. 12
      scripts/install-tools.sh
  5. 2
      tools/Dockerfile

@ -60,7 +60,7 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
iwilltry42@gmail.com.
tk@thklein.io.
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright © 2019-2022 Thorsten Klein <iwilltry42@gmail.com>
Copyright © 2019-2022 Thorsten Klein <tk@thklein.io>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

@ -220,9 +220,12 @@ endif
# - gox for cross-compilation (build-cross)
# - kubectl for E2E-tests (e2e)
ci-setup:
@echo "Installing Go tools..."
@echo "### Installing Go tools..."
@echo "### -> Installing golangci-lint..."
curl -sfL $(PKG_GOLANGCI_LINT_SCRIPT) | sh -s -- -b $(GOENVPATH)/bin v$(PKG_GOLANGCI_LINT_VERSION)
$(GO) get $(PKG_GOX)
@echo "Installing kubectl..."
@echo "### -> Installing gox..."
./scripts/install-tools.sh gox
@echo "### Installing kubectl..."
./scripts/install-tools.sh kubectl

@ -45,7 +45,16 @@ install_yq() {
install_golangci_lint() {
echo "Installing golangci-lint..."
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
}
install_gox() {
echo "Installing gox for $OS/$ARCH..."
GOX_REPO=iwilltry42/gox
GOX_VERSION=0.1.0
curl -sSfL https://github.com/${GOX_REPO}/releases/download/v${GOX_VERSION}/gox_${GOX_VERSION}_${OS}_${ARCH}.tar.gz | tar -xz -C /tmp
chmod +x /tmp/gox
mv /tmp/gox /usr/local/bin/gox
}
install_confd() {
@ -71,6 +80,7 @@ for pkg in "$@"; do
yq) install_yq;;
golangci-lint) install_golangci_lint;;
confd) install_confd;;
gox) install_gox;;
*) printf "ERROR: Unknown Package '%s'" $pkg;;
esac
done

@ -8,7 +8,7 @@ ENV GO111MODULE=on
ENV CGO_ENABLED=0
RUN make build
FROM alpine:3.13
FROM alpine:3.16
RUN apk update && apk add bash
WORKDIR /app
COPY --from=builder /app/bin/k3d-tools .

Loading…
Cancel
Save