Add benchtool to the release process and release v0.10.4 (#213)

* Add benchtool to release process

* Update go image to golang:1.16.8-stretch

* Update alpine image to alpine:3.14

* Update changelog

* Add benchtool to the changelog instructions

Author: simonswine

.dockerignore

@@ -0,0 +1 @@
+/dist/

.goreleaser.yml

@@ -40,6 +40,41 @@ builds:
     goarch:
       - amd64
       - 386
+  - id: benchtool-darwin
+    ldflags:
+      -s -w -X github.com/grafana/cortex-tools/pkg/version.Version={{.Version}}
+    binary: benchtool
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/benchtool/
+    goos:
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+  - id: benchtool-linux
+    ldflags:
+      -s -w -X github.com/grafana/cortex-tools/pkg/version.Version={{.Version}}
+    binary: benchtool
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/benchtool/
+    goos:
+      - linux
+    goarch:
+      - amd64
+  - id: benchtool-windows
+    ldflags:
+      -s -w -X github.com/grafana/cortex-tools/pkg/version.Version={{.Version}}
+    binary: benchtool
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/benchtool/
+    goos:
+      - windows
+    goarch:
+      - amd64
+      - 386
 archives:
   - replacements:
       darwin: mac-os
@@ -85,6 +120,22 @@ dockers:
     - "--label=org.opencontainers.image.version={{.Version}}"
     - "--label=repository=https://github.com/grafana/cortex-tools"
     - "--label=homepage=https://grafana.com"
+  - goos: linux
+    goarch: amd64
+    ids:
+      - benchtool-linux
+    dockerfile: cmd/benchtool/GR.Dockerfile
+    image_templates:
+      - "grafana/benchtool:latest"
+      - "grafana/benchtool:{{ .Tag }}"
+    build_flag_templates:
+    - "--pull"
+    - "--label=org.opencontainers.image.created={{.Date}}"
+    - "--label=org.opencontainers.image.name=benchtool"
+    - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+    - "--label=org.opencontainers.image.version={{.Version}}"
+    - "--label=repository=https://github.com/grafana/cortex-tools/tree/main/cmd/benchtool"
+    - "--label=homepage=https://grafana.com"
 brews:
   -
     tap:

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Order should be `CHANGE`, `FEATURE`, `ENHANCEMENT`, and `BUGFIX`
 
+## v0.10.4
+
+* [CHANGE] Update go image to v1.16.8. #213
+* [CHANGE] Update alpine image to v3.14. #213
+* [ENHANCEMENT] Add benchtool to the release process. #213
+
 ## v0.10.3
 
 * [BUGFIX] Fix `cortextool analyse grafana` failure on certain dashboards that use templating and/or panel heights due to unmarshalling errors with the underlying `grafana-tools/sdk` library. #192

changelogs/v0.10.4.md

@@ -0,0 +1,35 @@
+# v0.10.4 Release
+
+## Changes
+
+* [CHANGE] Update go image to v1.16.8. #213
+* [CHANGE] Update alpine image to v3.14. #213
+* [ENHANCEMENT] Add benchtool to the release process. #213
+
+## Installation
+
+## cortextool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "cortextool" "https://github.com/grafana/cortex-tools/releases/download/v0.10.4/cortextool_0.10.4_linux_x86_64"
+
+# make it executable
+$ chmod a+x "cortextool"
+
+# have fun :)
+$ ./cortextool --help
+```
+
+## benchtool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "benchtool" "https://github.com/grafana/cortex-tools/releases/download/v0.10.4/benchtool_0.10.4_linux_x86_64"
+
+# make it executable
+$ chmod a+x "benchtool"
+
+# have fun :)
+$ ./benchtool --help
+```

cmd/benchtool/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.16.3-stretch as build
+FROM golang:1.16.8-stretch as build
 ARG GOARCH="amd64"
 COPY . /build_dir
 WORKDIR /build_dir
 ENV GOPROXY=https://proxy.golang.org
 RUN make clean && make benchtool
 
-FROM       alpine:3.13
+FROM       alpine:3.14
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /build_dir/cmd/benchtool/benchtool /usr/bin/benchtool
 EXPOSE     80

cmd/benchtool/GR.Dockerfile

@@ -0,0 +1,5 @@
+FROM       alpine:3.14
+RUN        apk add --update --no-cache ca-certificates
+COPY       benchtool /usr/bin/benchtool
+EXPOSE     80
+ENTRYPOINT [ "/usr/bin/benchtool" ]

cmd/blockscopy/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.16.3-stretch as build
+FROM golang:1.16.8-stretch as build
 ARG GOARCH="amd64"
 COPY . /build_dir
 WORKDIR /build_dir
 ENV GOPROXY=https://proxy.golang.org
 RUN make clean && make blockscopy
 
-FROM       alpine:3.13
+FROM       alpine:3.14
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /build_dir/cmd/blockscopy/blockscopy /usr/bin/blockscopy
 EXPOSE     80

cmd/chunktool/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.16.3-stretch as build
+FROM golang:1.16.8-stretch as build
 ARG GOARCH="amd64"
 COPY . /build_dir
 WORKDIR /build_dir
 ENV GOPROXY=https://proxy.golang.org
 RUN make clean && make chunktool
 
-FROM       alpine:3.13
+FROM       alpine:3.14
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /build_dir/cmd/chunktool/chunktool /usr/bin/chunktool
 EXPOSE     80

cmd/cortextool/Dockerfile

@@ -1,11 +1,11 @@
-FROM golang:1.16.3-stretch as build
+FROM golang:1.16.8-stretch as build
 ARG GOARCH="amd64"
 COPY . /build_dir
 WORKDIR /build_dir
 ENV GOPROXY=https://proxy.golang.org
 RUN make clean && make cortextool
 
-FROM       alpine:3.13
+FROM       alpine:3.14
 RUN        apk add --update --no-cache ca-certificates
 COPY       --from=build /build_dir/cmd/cortextool/cortextool /usr/bin/cortextool
 EXPOSE     80

cmd/cortextool/GR.Dockerfile

@@ -1,4 +1,4 @@
-FROM       alpine:3.9
+FROM       alpine:3.14
 RUN        apk add --update --no-cache ca-certificates
 COPY       cortextool /usr/bin/cortextool
 EXPOSE     80