summaryrefslogtreecommitdiff
path: root/build/conformance/Dockerfile
diff options
context:
space:
mode:
authorcai6489 <144650622+cai6489@users.noreply.github.com>2023-11-28 15:10:04 +0800
committerGitHub <noreply@github.com>2023-11-28 15:10:04 +0800
commitbf325d652156ed9207293c1ad65b0212a79b84c7 (patch)
tree399309f2006774dcde38651d39c79cbc1bd8337c /build/conformance/Dockerfile
parentupdate codegen (diff)
parentMerge pull request #5207 from wbc6080/update-go-version (diff)
downloadkubeedge-bf325d652156ed9207293c1ad65b0212a79b84c7.tar.gz
Merge branch 'master' into v1beta1-dmi
Diffstat (limited to 'build/conformance/Dockerfile')
-rw-r--r--build/conformance/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/conformance/Dockerfile b/build/conformance/Dockerfile
index f9b2df8cd..3aa7600df 100644
--- a/build/conformance/Dockerfile
+++ b/build/conformance/Dockerfile
@@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
ARG GO_LDFLAGS
-RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.6.0
+RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.5
COPY . /go/src/github.com/kubeedge/kubeedge
@@ -30,7 +30,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off ginkgo build -ldflags "-w -s -extldflags -stat
RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/e2e-runner -ldflags "$GO_LDFLAGS -w -s" \
/go/src/github.com/kubeedge/kubeedge/build/conformance/e2e-runner
-FROM alpine:3.17
+FROM alpine:3.18
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo