Merge pull request #433 from soltysh/dockerfile_fixes

NO-JIRA: Update dockerfile rename changes

Makefile

@@ -7,14 +7,14 @@ include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
 	targets/openshift/images.mk \
 )
 
-IMAGE_REGISTRY :=registry.svc.ci.openshift.org
+IMAGE_REGISTRY :=registry.ci.openshift.org
 
 # This will call a macro called "build-image" which will generate image specific targets based on the parameters:
 # $0 - macro name
 # $1 - target name
 # $2 - image ref
 # $3 - Dockerfile path
 # $4 - context directory for image build
-$(call build-image,ocp-must-gather,$(IMAGE_REGISTRY)/ocp/4.2:ocp-must-gather, ./Dockerfile.rhel7,.)
+$(call build-image,ocp-must-gather,$(IMAGE_REGISTRY)/ocp/4.17:ocp-must-gather, ./Dockerfile.ocp,.)
 
-$(call verify-golang-versions,Dockerfile.rhel7)
+$(call verify-golang-versions,Dockerfile.ocp)