Skip to content

Commit

Permalink
change anchor: '#multi-manifests' to '#variable-substitution' [#15867…
Browse files Browse the repository at this point in the history
…2177]
  • Loading branch information
animatedmax committed Jun 28, 2018
1 parent 0e5c854 commit 6445daa
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions deploy-apps/manifest.html.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ The command line option `--docker-image` or `-o` overrides `docker.image`. The

The manifest attribute `docker.username` is optional. If it is used, then the password must be provided in the environment variable `CF_DOCKER_PASSWORD`. Additionally, if a Docker username is specified, then a Docker image must also be specified.

#### <a id='manifest-attibutes'></a> Manifest Attributes
The `docker` attribute cannot be used in conjunction with the following attributes: `buildpack` and `path`. An error will result.
<p class="note"><strong>Note</strong>: Using the <code>docker</code> attribute in conjunction with the <code>buildpack</code> or <code>path</code> attributes will result in an error.</p>

### <a id='health-check-http-endpoint'></a> health-check-http-endpoint

Expand Down Expand Up @@ -540,21 +539,21 @@ You can declare shared configuration using a YAML anchor, which the manifest ref
<pre>
---
defaults: &amp;defaults
 buildpack: staticfile_buildpack
 memory: 1G
buildpack: staticfile_buildpack
memory: 1G

applications:
- name: bigapp
 &lt;&lt;: *defaults
&lt;&lt;: *defaults
- name: smallapp
 &lt;&lt;: *defaults
 memory: 256M
&lt;&lt;: *defaults
memory: 256M
</pre>

This manifest pushes two apps, smallapp and bigapp, with the staticfile buildpack but with 256M memory for smallapp and 1G for bigapp.


## <a id='multi-manifests'></a> Variable Substitution
## <a id='variable-substitution'></a> Variable Substitution

Variable substitution replaces [Inheritance](#inheritance-deprecated), which has been deprecated.

Expand Down Expand Up @@ -679,15 +678,15 @@ The following example illustrates how to declare shared configuration using a YA
<pre>
---
defaults: &amp;defaults
 buildpack: staticfile_buildpack
 memory: 1G
buildpack: staticfile_buildpack
memory: 1G

applications:
- name: bigapp
 &lt;&lt;: *defaults
&lt;&lt;: *defaults
- name: smallapp
 &lt;&lt;: *defaults
 memory: 256M
&lt;&lt;: *defaults
memory: 256M
</pre>

When pushing the app, make explicit the attributes in each app’s declaration. To do this, assign the anchors and include the app-level attributes with YAML aliases in each app declaration.
Expand All @@ -700,9 +699,9 @@ Previously, you could specify routes by listing them all at once using the `rout
---
applications
- name: webapp
 host: www
 domains:
 - example.com
host: www
domains:
- example.com
- example.io
</pre>

Expand All @@ -721,13 +720,15 @@ Now you can only specify routes by using the `routes` attribute:
---
applications
- name: webapp
 routes:
 - route: www.example.com/foo
 - route: tcp.example.com:1234
routes:
- route: www.example.com/foo
- route: tcp.example.com:1234
</pre>

This app manifest feature has been deprecated, and a replacement option is under consideration.

### <a id='inheritance-deprecated'></a> Inheritance Is Deprecated
### <a id='inheritance-deprecated'></a> Inheritance

This feature has been deprecated, and has been replaced by [Variable Substitution](#variable-substitution).

With inheritance, child manifests inherited configurations from a parent manifest, and the child manifests could use inherited configurations as provided, extend them, or override them. This feature has been deprecated, and has been replaced by [Variable Substitution](#multi-manifests).
With inheritance, child manifests inherited configurations from a parent manifest, and the child manifests could use inherited configurations as provided, extend them, or override them.

0 comments on commit 6445daa

Please sign in to comment.