Skip to content

[release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPBUGS-36520: Rename Dockerfile to .ocp #1023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd95204
fix: rename Dockerfile
Leo6Leo Jul 23, 2025
f88c192
feat: add back the Dockerfile.rhel7 for CI compatibility
Leo6Leo Jul 24, 2025
cea65ba
fix: update README to use placeholder for username in Docker commands
Leo6Leo Jul 28, 2025
cd624a1
fix: revert Makefile to use Dockerfile.rhel7 for image build
Leo6Leo Jul 31, 2025
64dc631
Update README.md
Leo6Leo Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Dockerfile.rhel7 → Dockerfile.ocp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ IMAGE_REGISTRY?=registry.svc.ci.openshift.org
# $3 - Dockerfile path
# $4 - context directory for image build
# It will generate target "image-$(1)" for building the image and binding it as a prerequisite to target "images".
$(call build-image,ocp-console-operator,$(IMAGE_REGISTRY)/ocp/4.5:console-operator,./Dockerfile.rhel7,.)
$(call build-image,ocp-console-operator,$(IMAGE_REGISTRY)/ocp/4.5:console-operator,./Dockerfile.ocp,.)

# This will include additional actions on the update and verify targets to ensure that profile patches are applied
# to manifest files
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ docker build -t <registry>/<your-username>/console-operator:<version> .
# following: docker.io/openshift/origin-console-operator:latest
# for development, you are going to push to an alternate registry.
# specifically it can look something like this:
docker build -f Dockerfile.rhel7 -t quay.io/benjaminapetersen/console-operator:latest .
docker build -f Dockerfile.ocp -t quay.io/benjaminapetersen/console-operator:latest .
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Leo6Leo Would it be clearer to replace the benjaminapetersen with a placeholder like <your-username>. Also, this appears in multiple places in the file.

```
You can optionally build a specific version.

Expand Down