File tree Expand file tree Collapse file tree 7 files changed +7
-7
lines changed Expand file tree Collapse file tree 7 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 1
- FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
1
+ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
2
2
WORKDIR /go/src/github.com/openshift/machine-api-operator
3
3
COPY . .
4
4
RUN NO_DOCKER=1 make build
Original file line number Diff line number Diff line change 1
- FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
1
+ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
2
2
WORKDIR /go/src/github.com/openshift/machine-api-operator
3
3
COPY . .
4
4
RUN NO_DOCKER=1 make build
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ ifeq ($(NO_DOCKER), 1)
24
24
DOCKER_CMD =
25
25
IMAGE_BUILD_CMD = imagebuilder
26
26
else
27
- DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE ) --env GOFLAGS=$(GOFLAGS ) --rm -v "$(PWD ) ":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.12
27
+ DOCKER_CMD := docker run --env GO111MODULE=$(GO111MODULE ) --env GOFLAGS=$(GOFLAGS ) --rm -v "$(PWD ) ":/go/src/github.com/openshift/machine-api-operator:Z -w /go/src/github.com/openshift/machine-api-operator golang:1.13
28
28
IMAGE_BUILD_CMD = docker build
29
29
endif
30
30
Original file line number Diff line number Diff line change 11
11
--workdir /go/src/github.com/openshift/machine-api-operator \
12
12
--env GO111MODULE=" $GO111MODULE " \
13
13
--env GOFLAGS=" $GOFLAGS " \
14
- openshift/origin-release:golang-1.12 \
14
+ openshift/origin-release:golang-1.13 \
15
15
./hack/go-fmt.sh " ${@ } "
16
16
fi
Original file line number Diff line number Diff line change 10
10
--workdir /go/src/github.com/openshift/machine-api-operator \
11
11
--env GO111MODULE=" $GO111MODULE " \
12
12
--env GOFLAGS=" $GOFLAGS " \
13
- openshift/origin-release:golang-1.12 \
13
+ openshift/origin-release:golang-1.13 \
14
14
./hack/go-lint.sh " ${@ } "
15
15
fi
Original file line number Diff line number Diff line change 8
8
--workdir /go/src/github.com/openshift/machine-api-operator \
9
9
--env GO111MODULE=" $GO111MODULE " \
10
10
--env GOFLAGS=" $GOFLAGS " \
11
- openshift/origin-release:golang-1.12 \
11
+ openshift/origin-release:golang-1.13 \
12
12
./hack/go-vet.sh " ${@ } "
13
13
fi ;
Original file line number Diff line number Diff line change 11
11
--env IS_CONTAINER=TRUE \
12
12
--volume " ${PWD} :/go/src/sigs.k8s.io/${REPO_NAME} :z" \
13
13
--workdir " /go/src/sigs.k8s.io/${REPO_NAME} " \
14
- openshift/origin-release:golang-1.12 \
14
+ openshift/origin-release:golang-1.13 \
15
15
./hack/goimports.sh " ${@ } "
16
16
fi
You can’t perform that action at this time.
0 commit comments