mirror of
https://github.com/prymitive/karma
synced 2026-05-07 03:26:52 +00:00
Merge pull request #1469 from prymitive/renovate/docker-golang-1.x
chore(deps): update golang docker tag to v1.14.0
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
2
Makefile
2
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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
2
go.mod
2
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
|
||||
|
||||
@@ -29,7 +29,6 @@ func configureTLSClientCert(tlsConfig *tls.Config, certPath, keyPath string) err
|
||||
return err
|
||||
}
|
||||
tlsConfig.Certificates = []tls.Certificate{cert}
|
||||
tlsConfig.BuildNameToCertificate()
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user