From 6bea9cc3778032c80ec680271485db15cff9fc46 Mon Sep 17 00:00:00 2001
From: Jacob Weinstock <jakobweinstock@gmail.com>
Date: Fri, 20 Sep 2024 10:03:33 -0600
Subject: [PATCH] Fix linting warnings:

Pin apk packages in all Dockerfiles.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
---
 .golangci.yml                           | 6 +-----
 cmd/tink-agent/Dockerfile               | 2 +-
 cmd/tink-controller-v1alpha2/Dockerfile | 2 +-
 cmd/tink-controller/Dockerfile          | 2 +-
 cmd/tink-server/Dockerfile              | 2 +-
 cmd/tink-worker/Dockerfile              | 2 +-
 cmd/virtual-worker/Dockerfile           | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 3bda4241f..6702f825d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -84,10 +84,6 @@ linters-settings:
       - name: struct-tag
         arguments:
           - "json,inline"
-  staticcheck:
-    go: "1.18"
-  unused:
-    go: "1.18"
 output:
   sort-results: true
 linters:
@@ -103,7 +99,7 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - forcetypeassert
     - gocognit
     - goconst
diff --git a/cmd/tink-agent/Dockerfile b/cmd/tink-agent/Dockerfile
index def174da5..a1c43e8eb 100644
--- a/cmd/tink-agent/Dockerfile
+++ b/cmd/tink-agent/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20.3
 ARG TARGETOS
 ARG TARGETARCH
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/tink-agent-${TARGETOS}-${TARGETARCH} /usr/bin/tink-agent
 
diff --git a/cmd/tink-controller-v1alpha2/Dockerfile b/cmd/tink-controller-v1alpha2/Dockerfile
index ad4d4a32a..7b7f0a742 100644
--- a/cmd/tink-controller-v1alpha2/Dockerfile
+++ b/cmd/tink-controller-v1alpha2/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20.3
 ARG TARGETOS
 ARG TARGETARCH
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/tink-controller-v1alpha2-${TARGETOS}-${TARGETARCH} /usr/bin/tink-controller
 
diff --git a/cmd/tink-controller/Dockerfile b/cmd/tink-controller/Dockerfile
index 97436cbb6..8b725a6bb 100644
--- a/cmd/tink-controller/Dockerfile
+++ b/cmd/tink-controller/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20.3
 ARG TARGETOS
 ARG TARGETARCH
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/tink-controller-${TARGETOS}-${TARGETARCH} /usr/bin/tink-controller
 
diff --git a/cmd/tink-server/Dockerfile b/cmd/tink-server/Dockerfile
index 2d2bb2370..2a48a552f 100644
--- a/cmd/tink-server/Dockerfile
+++ b/cmd/tink-server/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 
 EXPOSE 42113 42114
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/tink-server-${TARGETOS}-${TARGETARCH} /usr/bin/tink-server
 
diff --git a/cmd/tink-worker/Dockerfile b/cmd/tink-worker/Dockerfile
index cd90e0525..c1ae155ee 100644
--- a/cmd/tink-worker/Dockerfile
+++ b/cmd/tink-worker/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20.3
 ARG TARGETOS
 ARG TARGETARCH
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/tink-worker-${TARGETOS}-${TARGETARCH} /usr/bin/tink-worker
 
diff --git a/cmd/virtual-worker/Dockerfile b/cmd/virtual-worker/Dockerfile
index d9e102f2f..ca914357c 100644
--- a/cmd/virtual-worker/Dockerfile
+++ b/cmd/virtual-worker/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20.3
 ARG TARGETOS
 ARG TARGETARCH
 
-RUN apk add --no-cache --update --upgrade ca-certificates
+RUN apk add --no-cache --update --upgrade ca-certificates=20240705-r0
 
 COPY bin/virtual-worker-${TARGETOS}-${TARGETARCH} /usr/bin/virtual-worker