Skip to content

Commit c2fe315

Browse files
authored
Merge pull request #3389 from ahardin-rh/3347-followup
Follow-up edits to PR#3347
2 parents 3068727 + 3b27958 commit c2fe315

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

dev_guide/application_lifecycle/new_app.adoc

+3-9
Original file line numberDiff line numberDiff line change
@@ -275,19 +275,18 @@ $ oc new-app ruby-helloworld-sample \
275275
----
276276
====
277277

278-
You can store your parameters in a file and then use this file with
278+
You can store your parameters in a file, then use that file with
279279
`--param-file` when instantiating a template. If you want to read the
280280
parameters from standard input, use `--param-file=-`:
281281

282-
====
282+
283283
----
284284
$ cat helloworld.params
285285
ADMIN_USERNAME=admin
286286
ADMIN_PASSWORD=mypassword
287287
$ oc new-app ruby-helloworld-sample --param-file=helloworld.params
288288
$ cat helloworld.params | oc new-app ruby-helloworld-sample --param-file=-
289289
----
290-
====
291290

292291
[[new-app-output]]
293292

@@ -347,34 +346,29 @@ When generating applications from a xref:specifying-a-template[template], xref:s
347346
xref:specifying-an-image[image], you can use the `-e|--env` argument to pass
348347
environment variables to the application container at run time:
349348

350-
====
351349
----
352350
$ oc new-app openshift/postgresql-92-centos7 \
353351
-e POSTGRESQL_USER=user \
354352
-e POSTGRESQL_DATABASE=db \
355353
-e POSTGRESQL_PASSWORD=password
356354
----
357-
====
358355

359356
The variables can also be read from file using the `--env-file` argument:
360357

361-
====
362358
----
363359
$ cat postgresql.env
364360
POSTGRESQL_USER=user
365361
POSTGRESQL_DATABASE=db
366362
POSTGRESQL_PASSWORD=password
367363
$ oc new-app openshift/postgresql-92-centos7 --env-file=postgresql.env
368364
----
369-
====
370365

371366
Additionally, environment variables can be given on standard input by using
372367
`--env-file=-`:
373-
====
368+
374369
----
375370
$ cat postgresql.env | oc new-app openshift/postgresql-92-centos7 --env-file=-
376371
----
377-
====
378372

379373
[NOTE]
380374
====

dev_guide/templates.adoc

+2-6
Original file line numberDiff line numberDiff line change
@@ -220,26 +220,22 @@ $ oc process -f my-rails-postgresql \
220220
----
221221
====
222222

223-
If you have large number of parameters you might prefer to store them in a file
224-
and then pass this file to `oc process`:
223+
If you have large number of parameters, you can store them in a file and then
224+
pass this file to `oc process`:
225225

226-
====
227226
----
228227
$ cat postgres.env
229228
POSTGRESQL_USER=bob
230229
POSTGRESQL_DATABASE=mydatabase
231230
$ oc process -f my-rails-postgresql --param-file=postgres.env
232231
----
233-
====
234232

235233
You can also read the environment from standard input by using `"-"` as the
236234
argument to `--param-file`:
237235

238-
====
239236
----
240237
$ sed s/bob/alice/ postgres.env | oc process -f my-rails-postgresql --param-file=-
241238
----
242-
====
243239

244240
[[modifying-an-uploaded-template]]
245241

0 commit comments

Comments
 (0)