Skip to content

Commit 6445daa

Browse files
committed
change anchor: '#multi-manifests' to '#variable-substitution' [#158672177]
1 parent 0e5c854 commit 6445daa

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

deploy-apps/manifest.html.md.erb

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ The command line option `--docker-image` or `-o` overrides `docker.image`. The
217217

218218
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.
219219

220-
#### <a id='manifest-attibutes'></a> Manifest Attributes
221-
The `docker` attribute cannot be used in conjunction with the following attributes: `buildpack` and `path`. An error will result.
220+
<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>
222221

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

@@ -540,21 +539,21 @@ You can declare shared configuration using a YAML anchor, which the manifest ref
540539
<pre>
541540
---
542541
defaults: &amp;defaults
543-
 buildpack: staticfile_buildpack
544-
 memory: 1G
542+
buildpack: staticfile_buildpack
543+
memory: 1G
545544

546545
applications:
547546
- name: bigapp
548-
 &lt;&lt;: *defaults
547+
&lt;&lt;: *defaults
549548
- name: smallapp
550-
 &lt;&lt;: *defaults
551-
 memory: 256M
549+
&lt;&lt;: *defaults
550+
memory: 256M
552551
</pre>
553552

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

556555

557-
## <a id='multi-manifests'></a> Variable Substitution
556+
## <a id='variable-substitution'></a> Variable Substitution
558557

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

@@ -679,15 +678,15 @@ The following example illustrates how to declare shared configuration using a YA
679678
<pre>
680679
---
681680
defaults: &amp;defaults
682-
 buildpack: staticfile_buildpack
683-
 memory: 1G
681+
buildpack: staticfile_buildpack
682+
memory: 1G
684683

685684
applications:
686685
- name: bigapp
687-
 &lt;&lt;: *defaults
686+
&lt;&lt;: *defaults
688687
- name: smallapp
689-
 &lt;&lt;: *defaults
690-
 memory: 256M
688+
&lt;&lt;: *defaults
689+
memory: 256M
691690
</pre>
692691

693692
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.
@@ -700,9 +699,9 @@ Previously, you could specify routes by listing them all at once using the `rout
700699
---
701700
applications
702701
- name: webapp
703-
 host: www
704-
 domains:
705-
 - example.com
702+
host: www
703+
domains:
704+
- example.com
706705
- example.io
707706
</pre>
708707

@@ -721,13 +720,15 @@ Now you can only specify routes by using the `routes` attribute:
721720
---
722721
applications
723722
- name: webapp
724-
 routes:
725-
 - route: www.example.com/foo
726-
 - route: tcp.example.com:1234
723+
routes:
724+
- route: www.example.com/foo
725+
- route: tcp.example.com:1234
727726
</pre>
728727

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

731-
### <a id='inheritance-deprecated'></a> Inheritance Is Deprecated
730+
### <a id='inheritance-deprecated'></a> Inheritance
731+
732+
This feature has been deprecated, and has been replaced by [Variable Substitution](#variable-substitution).
732733

733-
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).
734+
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 commit comments

Comments
 (0)