Merge branch 'main' into impersonation-proxy

2021-03-15 16:28:25 -07:00 · 2021-03-15 16:28:25 -07:00 · e47543233c
commit e47543233c
parent 2460568be3 ab6452ace7
2 changed files with 1 additions and 5 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -23,7 +23,3 @@ repos:
    name: Validate copyright year
    entry: hack/check-copyright-year.sh
    language: script
- repo: https://github.com/golangci/golangci-lint
-  rev: v1.33.0
-  hooks:
-  - id: golangci-lint
--- a/2
+++ b/2
@ -3,7 +3,7 @@
 # Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0

-FROM golang:1.16.1 as build-env
+FROM golang:1.16.2 as build-env

 WORKDIR /work
 COPY . .