From 36ea8bae71b2b3e0dd9170bf7b43d3f36c54d7ca Mon Sep 17 00:00:00 2001
From: Jake Sanders <jsand@google.com>
Date: Tue, 13 Jul 2021 18:26:42 -0700
Subject: [PATCH] Update docker go version and github actions (#372)
Signed-off-by: Jake Sanders <jsand@google.com>
---
.github/workflows/build.yml | 2 +-
.github/workflows/verify.yml | 3 +--
Dockerfile | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e1072d..c81d651 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v2.3.4
- uses: sigstore/cosign-installer@main
with:
- cosign-release: 'v0.5.0'
+ cosign-release: 'v0.6.0'
- name: Extract version of Go to use
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | sed -r 's/^.*://g'| uniq)" >> $GITHUB_ENV
- uses: actions/setup-go@v2
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 253bbf5..a51267d 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -47,5 +47,4 @@ jobs:
uses: golangci/golangci-lint-action@v2.5.2
timeout-minutes: 5
with:
- # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
- version: v1.39
+ version: latest
diff --git a/Dockerfile b/Dockerfile
index 7355cb5..8489517 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.16.5 AS builder
+FROM golang:1.16.6 AS builder
ENV APP_ROOT=/opt/app-root
ENV GOPATH=$APP_ROOT
@@ -30,7 +30,7 @@ RUN go build -ldflags "${SERVER_LDFLAGS}" ./cmd/rekor-server
RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -ldflags "${SERVER_LDFLAGS}" -o rekor-server_debug ./cmd/rekor-server
# Multi-Stage production build
-FROM golang:1.16.5 as deploy
+FROM golang:1.16.6 as deploy
# Retrieve the binary from the previous stage
COPY --from=builder /opt/app-root/src/rekor-server /usr/local/bin/rekor-server
--
GitLab