Skip to content

Commit bc2801f

Browse files
authored
Merge pull request #40 from openshift/tooling_images
use origin-release images for tooling
2 parents 7957e91 + d72b9e2 commit bc2801f

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ integration:
5656
go test -v sigs.k8s.io/cluster-api-provider-aws/test/integration
5757

5858
fmt:
59-
hack/verify-gofmt.sh
59+
hack/go-fmt.sh .
6060

6161
vet:
62-
go vet ./...
62+
hack/go-vet.sh ./...

hack/go-fmt.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ else
99
--env IS_CONTAINER=TRUE \
1010
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
1111
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
12-
--entrypoint sh \
13-
quay.io/coreos/golang-testing \
12+
openshift/origin-release:golang-1.10 \
1413
./hack/go-fmt.sh "${@}"
1514
fi

hack/go-lint.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ else
88
--env IS_CONTAINER=TRUE \
99
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
1010
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
11-
--entrypoint sh \
12-
quay.io/coreos/golang-testing \
11+
openshift/origin-release:golang-1.10 \
1312
./hack/go-lint.sh "${@}"
1413
fi

hack/go-vet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ else
66
--env IS_CONTAINER=TRUE \
77
--volume "${PWD}:/go/src/sigs.k8s.io/cluster-api-provider-aws:z" \
88
--workdir /go/src/sigs.k8s.io/cluster-api-provider-aws \
9-
quay.io/coreos/golang-testing \
9+
openshift/origin-release:golang-1.10 \
1010
./hack/go-vet.sh "${@}"
1111
fi;

0 commit comments

Comments
 (0)