Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docs/builds.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Company Y wants to leverage OpenShift to build Docker images, but their Devops S

## Build Strategies

The OpenShift build system provides extensible support for build strategies based on selectable types specified in the build API. By default, two strategies are supported: Docker builds, and [Source-To-Images (sti)](https://github.com/openshift/source-to-image) builds.
The OpenShift build system provides extensible support for build strategies based on selectable types specified in the build API. By default, two strategies are supported: Docker builds, and [Source-To-Images (sti)](https://github.com/openshift/source-to-image#source-to-image-sti) builds.

### Docker Builds

Expand Down Expand Up @@ -74,7 +74,7 @@ For these reasons, Docker-in-Docker is not considered a viable build strategy fo

### STI (Source-to-Image) Builds

OpenShift also supports [Source-To-Images (sti)](https://github.com/openshift/source-to-image) builds.
OpenShift also supports [Source-To-Images (sti)](https://github.com/openshift/source-to-image#source-to-image-sti) builds.

Source-to-images (sti) is a tool for building reproducible Docker images. It produces ready-to-run images by injecting a user source into a docker image and assembling a new Docker image which incorporates the base image and built source, and is ready to use with `docker run`. STI supports incremental builds which re-use previously downloaded dependencies, previously built artifacts, etc.

Expand Down
2 changes: 1 addition & 1 deletion docs/deployments.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

In OpenShift, deployment is an update to a single replication controller's pod template based on triggered events. The deployment subsystem provides:

* [Declarative definition](#defining a deploymentConfig) of a desired deployment configuration which drives automated deployments by the system
* [Declarative definition](#defining-a-deploymentconfig) of a desired deployment configuration which drives automated deployments by the system
* [Triggers](#triggers) which drive new deployments in response to events
* [Rollbacks](#rollbacks) to a previous deployment
* [Strategies](strategies) for deployment rollout behavior which are user-customizable
Expand Down
2 changes: 1 addition & 1 deletion docs/openshift_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Model object that stores the logs from a particular build for later inspection.

## Deployment

A deployment is a specially annotated [replicationController](kubernetes_model.md#replicationcontroller), specifying the desired configuration of that controller. See the [deployments](deployments.md) document.
A deployment is a specially annotated [replicationController](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/replication-controller.md), specifying the desired configuration of that controller. See the [deployments](deployments.md) document.

## DeploymentConfig

Expand Down
2 changes: 1 addition & 1 deletion docs/router_sharding.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- how is router configuration visualized from a user perspective
- how is router configuration visualized from an admin perspective
- how is a user notified of a route route binding and final dns
- how is a user notified of a route binding and final dns
- how does a user request default dns name vs custom dns name
- router fronting with DNS, how are entries created

Expand Down
1 change: 0 additions & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ available on top of Kubernetes and Docker.
* [Hello OpenShift](./hello-openshift) is a simple Hello World style application that can be used to start a simple pod
* [OpenShift Sample](./sample-app) is an end-to-end application demonstrating the full
OpenShift v3 concept chain - images, builds, deployments, and templates.
* [Guestbook](./guestbook) takes the [Kubernetes guestbook](https://github.com/GoogleCloudPlatform/kubernetes/tree/master/examples/guestbook) and combines it into a single **template**, which can parameterize and deploy the entire guestbook in a single call.