Skip to content

Commit 36570f0

Browse files
authored
Merge pull request #3123 from mmilata/disallow-comma-sep-env-vars
Do not use comma-separated environment variables
2 parents 6551b60 + d996747 commit 36570f0

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

using_images/db_images/mongodb.adoc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@ xref:../../architecture/core_concepts/pods_and_services.adoc#pods[pod] with
6969
MongoDB running in a container:
7070

7171
----
72-
$ oc new-app -e \
73-
MONGODB_USER=<username>,MONGODB_PASSWORD=<password>,MONGODB_DATABASE=<database_name>,MONGODB_ADMIN_PASSWORD=<admin_password> \
72+
$ oc new-app \
73+
-e MONGODB_USER=<username> \
74+
-e MONGODB_PASSWORD=<password> \
75+
-e MONGODB_DATABASE=<database_name> \
76+
-e MONGODB_ADMIN_PASSWORD=<admin_password> \
7477
ifdef::openshift-enterprise[]
7578
registry.access.redhat.com/rhscl/mongodb-26-rhel7
7679
endif::[]

using_images/db_images/mysql.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ xref:../../architecture/core_concepts/pods_and_services.adoc#pods[pod] with
6868
MySQL running in a container:
6969

7070
----
71-
$ oc new-app -e \
72-
MYSQL_USER=<username>,MYSQL_PASSWORD=<password>,MYSQL_DATABASE=<database_name> \
71+
$ oc new-app \
72+
-e MYSQL_USER=<username> \
73+
-e MYSQL_PASSWORD=<password> \
74+
-e MYSQL_DATABASE=<database_name> \
7375
ifdef::openshift-enterprise[]
7476
registry.access.redhat.com/openshift3/mysql-55-rhel7
7577
endif::[]

using_images/db_images/postgresql.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ xref:../../architecture/core_concepts/pods_and_services.adoc#pods[pod] with
7777
PostgreSQL running in a container:
7878

7979
----
80-
$ oc new-app -e \
81-
POSTGRESQL_USER=<username>,POSTGRESQL_PASSWORD=<password>,POSTGRESQL_DATABASE=<database_name> \
80+
$ oc new-app \
81+
-e POSTGRESQL_USER=<username> \
82+
-e POSTGRESQL_PASSWORD=<password> \
83+
-e POSTGRESQL_DATABASE=<database_name> \
8284
ifdef::openshift-enterprise[]
8385
registry.access.redhat.com/rhscl/postgresql-94-rhel7
8486
endif::[]

using_images/s2i_images/java.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ To specify the output directory and which modules to build in a multi-module
9898
project:
9999

100100
----
101-
s2i build -e "OUTPUT_DIR=<path/to/myartifact/target>,MAVEN_ARGS=install -pl <my.groupId>:<my.artifactId> -am" <git_repo_URL> fabric8/java-main <target_image_name>
101+
s2i build -e "OUTPUT_DIR=<path/to/myartifact/target>" -e "MAVEN_ARGS=install -pl <my.groupId>:<my.artifactId> -am" <git_repo_URL> fabric8/java-main <target_image_name>
102102
----

0 commit comments

Comments
 (0)