update k8s-ci-builder dockerfile

Signed-off-by: cpanato <ctadeu@gmail.com>

dependencies.yaml

@@ -106,8 +106,6 @@ dependencies:
   - name: "golang: after kubernetes/kubernetes update"
     version: 1.20.6
     refPaths:
-    - path: images/releng/k8s-ci-builder/Dockerfile
-      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-\${OS_CODENAME} AS builder
     - path: images/releng/k8s-ci-builder/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
     - path: images/releng/k8s-ci-builder/variants.yaml

images/releng/k8s-ci-builder/Dockerfile

@@ -17,7 +17,7 @@ ARG OS_CODENAME
 
 # The Golang version for the builder image should always be explicitly set to
 # the Golang version of the kubernetes/kubernetes active development branch
-FROM golang:1.20.6-${OS_CODENAME} AS builder
+FROM golang:${GO_VERSION}-${OS_CODENAME} AS builder
 
 WORKDIR /go/src/k8s.io/release
 
@@ -103,10 +103,8 @@ RUN echo "Installing Packages ..." \
             --usage-reporting=false \
         && gcloud components install kubectl \
     && echo "Installing Docker ..." \
-        && curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - \
-        && add-apt-repository \
-            "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-            $(lsb_release -cs) stable" \
+        && install -m 0755 -d /etc/apt/keyrings && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+        && echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
         && apt-get update \
         && apt-get install -y --no-install-recommends docker-ce \
         && rm -rf /var/lib/apt/lists/* \