Skip to content

Commit f7159f7

Browse files
authored
Merge pull request #373 from phoracek/ginkgo_for_1.18
Pin version of Ginkgo and change builder image
2 parents 70e52f7 + 0982543 commit f7159f7

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

cmd/Dockerfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
FROM quay.io/centos/centos:stream8 as builder
1+
FROM quay.io/projectquay/golang:1.18 as builder
22

33
RUN mkdir /workdir
44
WORKDIR /workdir
55

6-
COPY go.mod .
7-
RUN dnf install -y golang-$(sed -En 's/^go +(.*+)$/\1/p' go.mod).*
8-
96
COPY . .
107

118
ENV GOOS linux

hack/docker-builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727
tar -xzf cni-plugins-linux-amd64-v1.0.1.tgz && \
2828
rm -f cni-plugins-linux-amd64-v1.0.1.tgz
2929

30-
RUN go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
30+
RUN go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.14.0
3131

3232
ADD entrypoint.sh /entrypoint.sh
3333

0 commit comments

Comments
 (0)