[release-1.8] Golang 1.20.6 for test runner (#10231)

* Golang 1.20.6 for test runner * alpine 3.18.2 as well Signed-off-by: James Strong <[email protected]> --------- Signed-off-by: James Strong <[email protected]> Co-authored-by: James Strong <[email protected]>
kubernetes · Jul 21, 2023 · c07b462 · c07b462
1 parent 4b22ebc
commit c07b462
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/images/cfssl/rootfs/Dockerfile b/images/cfssl/rootfs/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.18.0
+FROM alpine:3.18.2
 
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories

diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM alpine:3.18.0 as builder
+FROM alpine:3.18.2 as builder
 
 COPY . /
 
@@ -21,7 +21,7 @@ RUN apk update \
   && /build.sh
 
 # Use a multi-stage build
-FROM alpine:3.18.0
+FROM alpine:3.18.2
 
 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin
 

diff --git a/images/opentelemetry/rootfs/Dockerfile b/images/opentelemetry/rootfs/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM alpine:3.18.0 as base
+FROM alpine:3.18.2 as base
 
 RUN mkdir -p /opt/third_party/install
 COPY . /opt/third_party/

diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
@@ -43,7 +43,7 @@ image:
 		--pull \
 		--push \
 		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
-		--build-arg GOLANG_VERSION=1.20.5 \
+		--build-arg GOLANG_VERSION=1.20.6 \
 		--build-arg ETCD_VERSION=3.4.3-0 \
 		--build-arg K8S_RELEASE=v1.26.0 \
 		--build-arg RESTY_CLI_VERSION=0.27 \
@@ -64,7 +64,7 @@ build: ensure-buildx
 		--progress=${PROGRESS} \
 		--pull \
 		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
-		--build-arg GOLANG_VERSION=1.20.5 \
+		--build-arg GOLANG_VERSION=1.20.6 \
 		--build-arg ETCD_VERSION=3.4.3-0 \
 		--build-arg K8S_RELEASE=v1.26.0 \
 		--build-arg RESTY_CLI_VERSION=0.27 \

diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot
@@ -23,7 +23,7 @@ RUN apk update \
   && apk upgrade \
   && /chroot.sh
 
-FROM alpine:3.18.0
+FROM alpine:3.18.2
 
 ARG TARGETARCH
 ARG VERSION

diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
@@ -1,7 +1,7 @@
 ARG E2E_BASE_IMAGE
 FROM ${E2E_BASE_IMAGE} AS BASE
 
-FROM alpine:3.18.0
+FROM alpine:3.18.2
 
 RUN apk update \
 	&& apk upgrade && apk add -U --no-cache \