From 5f5830476a51f1885820cf80ea33fafb0af978e2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 26 Feb 2020 01:53:44 +0000 Subject: [PATCH 1/4] chore(deps): update golang docker tag to v1.14.0 --- Dockerfile | 2 +- demo/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e26a6433f..1fbff04fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ COPY Makefile /src/Makefile COPY ui /src/ui RUN make -C /src ui -FROM golang:1.13.8-alpine3.11 as go-builder +FROM golang:1.14.0-alpine3.11 as go-builder RUN apk add make git COPY Makefile /src/Makefile COPY go.mod /src/go.mod diff --git a/demo/Dockerfile b/demo/Dockerfile index 4d4bee781..d677ae735 100644 --- a/demo/Dockerfile +++ b/demo/Dockerfile @@ -7,7 +7,7 @@ COPY Makefile /src/Makefile COPY ui /src/ui RUN make -C /src ui -FROM golang:1.13.8-alpine3.11 as go-builder +FROM golang:1.14.0-alpine3.11 as go-builder RUN apk add make git COPY Makefile /src/Makefile COPY go.mod /src/go.mod From 5a323cafd60948cf478c077c7b9905a9f58dc3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 26 Feb 2020 09:18:52 +0000 Subject: [PATCH 2/4] chore(ci): use Go 1.14 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f2430f528..5c8062180 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ __defaults_go: &DEFAULTS_GO language: go - go: "1.13.8" + go: "1.14" cache: directories: # https://restic.net/blog/2018-09-02/travis-build-cache From 0dfdeda1391d355cb6fe1c398991477b4739b2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 26 Feb 2020 09:34:39 +0000 Subject: [PATCH 3/4] fix(ci): rewrite CI golang version 1.14 => 1.14.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 702642e7d..0fb6b2f5a 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ lint-docs: .build/deps-build-node.ok .PHONY: lint-golang-version lint-golang-version: - $(eval CI_VERSION := $(shell grep -E '^(\ +)go:' .travis.yml | awk '{print $$2}' | tr -d "'\"")) + $(eval CI_VERSION := $(shell grep -E '^(\ +)go:' .travis.yml | awk '{print $$2}' | tr -d "'\"" | sed -E s_'^([0-9]+\.[0-9]+)$$'_'\1.0'_g)) $(eval BUILD_VERSION := $(shell grep -E '^FROM golang:' Dockerfile | cut -d : -f 2 | awk '{print $1}' | cut -d '-' -f 1)) $(eval DEMO_VERSION := $(shell grep -E '^FROM golang:' demo/Dockerfile | cut -d : -f 2 | awk '{print $1}' | cut -d '-' -f 1)) @if [ "$(CI_VERSION)" != "$(BUILD_VERSION)" ] || [ "$(CI_VERSION)" != "$(DEMO_VERSION)" ] || [ "$(BUILD_VERSION)" != "$(DEMO_VERSION)" ]; then \ From 1b31486eff91d374fdebb38fff9cf99964ae2f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 26 Feb 2020 09:48:29 +0000 Subject: [PATCH 4/4] fix(backend): remove deprecated BuildNameToCertificate usage --- go.mod | 2 +- internal/alertmanager/tls.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 32a891e94..2ee6c124c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/prymitive/karma -go 1.12 +go 1.14 require ( github.com/DeanThompson/ginpprof v0.0.0-20190408063150-3be636683586 diff --git a/internal/alertmanager/tls.go b/internal/alertmanager/tls.go index 45f3d9151..bb3641783 100644 --- a/internal/alertmanager/tls.go +++ b/internal/alertmanager/tls.go @@ -29,7 +29,6 @@ func configureTLSClientCert(tlsConfig *tls.Config, certPath, keyPath string) err return err } tlsConfig.Certificates = []tls.Certificate{cert} - tlsConfig.BuildNameToCertificate() return nil }