From 30c1b4108fa43f3fdc827eee92c863042e94bdf5 Mon Sep 17 00:00:00 2001 From: Pawel Krupa Date: Mon, 10 Sep 2018 15:49:15 +0200 Subject: [PATCH 1/2] use official red hat tooling image --- hack/go-fmt.sh | 3 +-- hack/go-lint.sh | 3 +-- hack/go-vet.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh index 255499ee58b..81bd0601f04 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -9,7 +9,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - --entrypoint sh \ - quay.io/coreos/golang-testing \ + openshift/origin-release:golang-1.10 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-lint.sh b/hack/go-lint.sh index 972b8efdd6a..8cde21959f6 100755 --- a/hack/go-lint.sh +++ b/hack/go-lint.sh @@ -8,7 +8,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - --entrypoint sh \ - quay.io/coreos/golang-testing \ + openshift/origin-release:golang-1.10 \ ./hack/go-lint.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index 4351e4ff9b0..4f7925a8d82 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -6,6 +6,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - quay.io/coreos/golang-testing \ + openshift/origin-release:golang-1.10 \ ./hack/go-vet.sh "${@}" fi; From 66b01a237320f793e0700d9acce6a931cd9fcbb7 Mon Sep 17 00:00:00 2001 From: Pawel Krupa Date: Tue, 11 Sep 2018 11:54:23 +0200 Subject: [PATCH 2/2] add docker.io prefix --- hack/go-fmt.sh | 2 +- hack/go-lint.sh | 2 +- hack/go-vet.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh index 81bd0601f04..25d26280a4d 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -9,6 +9,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - openshift/origin-release:golang-1.10 \ + docker.io/openshift/origin-release:golang-1.10 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-lint.sh b/hack/go-lint.sh index 8cde21959f6..4e26b8a7c52 100755 --- a/hack/go-lint.sh +++ b/hack/go-lint.sh @@ -8,6 +8,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - openshift/origin-release:golang-1.10 \ + docker.io/openshift/origin-release:golang-1.10 \ ./hack/go-lint.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index 4f7925a8d82..1ee2de4cf8d 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -6,6 +6,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - openshift/origin-release:golang-1.10 \ + docker.io/openshift/origin-release:golang-1.10 \ ./hack/go-vet.sh "${@}" fi;