Rename Dockerfiles

This commit fixes OCPBUGS-38475. https://issues.redhat.com/browse/OCPBUGS-38475 * images/router/base/Dockerfile.ocp: Renamed from Dockerfile.rhel * images/router/haproxy/Dockerfile.ocp: Renamed from Dockerfile.rhel8 to a version independent name.
openshift · Aug 16, 2024 · 3c40489 · 3c40489
1 parent a731372
commit 3c40489
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all build check images/router/*/Dockerfile images/router/*/Dockerfile.rhel
+.PHONY: all build check images/router/*/Dockerfile images/router/*/Dockerfile.ocp
 
 PACKAGE=github.com/openshift/router
 MAIN_PACKAGE=$(PACKAGE)/cmd/openshift-router
@@ -33,8 +33,8 @@ build:
 images/router/*/Dockerfile: images/router/base/Dockerfile
 	imagebuilder -t registry.svc.ci.openshift.org/openshift/origin-v4.0:`basename $(@D)`-router -f images/router/`basename $(@D)`/Dockerfile .
 
-images/router/*/Dockerfile.rhel: images/router/base/Dockerfile.rhel
-	imagebuilder -t registry.svc.ci.openshift.org/ocp/4.0:`basename $(@D)`-router -f images/router/`basename $(@D)`/Dockerfile.rhel .
+images/router/*/Dockerfile.ocp: images/router/base/Dockerfile.ocp
+	imagebuilder -t registry.svc.ci.openshift.org/ocp/4.0:`basename $(@D)`-router -f images/router/`basename $(@D)`/Dockerfile.ocp .
 
 check:
 	CGO_ENABLED=1 $(GO) test -race ./...

diff --git a/images/router/base/Dockerfile.rhel → images/router/base/Dockerfile.ocp b/images/router/base/Dockerfile.rhel → images/router/base/Dockerfile.ocp
diff --git a/images/router/haproxy/Dockerfile.rhel8 → images/router/haproxy/Dockerfile.ocp b/images/router/haproxy/Dockerfile.rhel8 → images/router/haproxy/Dockerfile.ocp