Skip to content

Commit

Permalink
Merge pull request #17050 from linzhaoming/fix-docs
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Fixed the wrong name of building image. According to the implementati…

…on and running behavior. the building image is openshift/origin-release
  • Loading branch information
openshift-merge-robot authored Nov 9, 2017
2 parents 74ecd2f + 215b3d8 commit 79ba774
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ https://github.com/openshift/origin[origin repo].

You can develop OpenShift on Windows, Mac, or Linux, but you'll need Docker
installed on Linux to actually launch containers. Client and server binaries
can be built locally or in the `openshift/release` container environment. The
can be built locally or in the `openshift/origin-release` container environment. The
http://golang.org/[Go] programming language is only necessary for building on
the local host.

Expand Down
2 changes: 1 addition & 1 deletion HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ We generally cut a release before disruptive changes land.

### Building on Non-Linux Systems

We provide the `openshift/release` container in which all of our build
We provide the `openshift/origin-release` container in which all of our build
dependencies live, so that one can build a full release of OpenShift without
having to install anything other than a container runtime on their local system.
To run scripts or `make` targets from the Origin repo inside of the container,
Expand Down

0 comments on commit 79ba774

Please sign in to comment.