浏览代码

Merge pull request #43802 from thaJeztah/bump_go_1.18.4

update golang to 1.18.4
Akihiro Suda 3 年之前
父节点
当前提交
c7d2099ddb
共有 5 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      .github/workflows/windows.yml
  2. 1 1
      Dockerfile
  3. 1 1
      Dockerfile.e2e
  4. 1 1
      Dockerfile.simple
  5. 1 1
      Dockerfile.windows

+ 1 - 1
.github/workflows/windows.yml

@@ -15,7 +15,7 @@ on:
   pull_request:
   pull_request:
 
 
 env:
 env:
-  GO_VERSION: 1.18.3
+  GO_VERSION: 1.18.4
   GOTESTLIST_VERSION: v0.2.0
   GOTESTLIST_VERSION: v0.2.0
   TESTSTAT_VERSION: v0.1.3
   TESTSTAT_VERSION: v0.1.3
   WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore
   WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore

+ 1 - 1
Dockerfile

@@ -2,7 +2,7 @@
 
 
 ARG CROSS="false"
 ARG CROSS="false"
 ARG SYSTEMD="false"
 ARG SYSTEMD="false"
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG VPNKIT_VERSION=0.5.0
 
 

+ 1 - 1
Dockerfile.e2e

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 
 
 FROM golang:${GO_VERSION}-alpine AS base
 FROM golang:${GO_VERSION}-alpine AS base
 ENV GO111MODULE=off
 ENV GO111MODULE=off

+ 1 - 1
Dockerfile.simple

@@ -5,7 +5,7 @@
 
 
 # This represents the bare minimum required to build and test Docker.
 # This represents the bare minimum required to build and test Docker.
 
 
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 
 
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG BASE_DEBIAN_DISTRO="bullseye"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"

+ 1 - 1
Dockerfile.windows

@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
 # Use PowerShell as the default shell
 # Use PowerShell as the default shell
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 
-ARG GO_VERSION=1.18.3
+ARG GO_VERSION=1.18.4
 ARG CONTAINERD_VERSION=v1.6.6
 ARG CONTAINERD_VERSION=v1.6.6
 ARG GOTESTSUM_VERSION=v1.8.1
 ARG GOTESTSUM_VERSION=v1.8.1
 ARG GOWINRES_VERSION=v0.2.3
 ARG GOWINRES_VERSION=v0.2.3