Skip to content

Commit 49c05ad

Browse files
author
Timothy Poitras
committed
Follow-up updates to previously changes by mnagy
1 parent 7c39f8e commit 49c05ad

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

using_images/s2i_images/ruby.adoc

+10-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ endif::openshift-enterprise[]
2323
assembles your application source with any required dependencies to create a
2424
new image containing your Ruby application. This resulting image can be run either by {product-title} or by Docker.
2525

26+
[[s2i-images-ruby-versions]]
2627
== Versions
2728
Currently, {product-title} provides version
2829
https://github.com/openshift/sti-ruby/tree/master/2.0[2.0] of Ruby.
2930

31+
[[s2i-images-ruby-images]]
3032
== Images
3133

3234
This image comes in two flavors, depending on your needs:
@@ -62,6 +64,7 @@ ImageStream. You can find
6264
https://github.com/openshift/origin/tree/master/examples/image-streams[example
6365
image stream definitions] for all the provided {product-title} images.
6466

67+
[[s2i-images-ruby-config]]
6568
== Configuration
6669
The Ruby image supports a number of environment variables which can be set to
6770
control the configuration and behavior of the Ruby runtime.
@@ -99,10 +102,15 @@ environment. Therefore, you can use this variable when assets have already been
99102
compiled.
100103

101104
|`*PUMA_MIN_THREADS*`, `*PUMA_MAX_THREADS*`
102-
|Indicates the minimum and maximum threads that will be available in https://github.com/puma/puma[Puma]'s thread pool.
105+
|This variable indicates the minimum and maximum number of threads that will be
106+
available in link:https://github.com/puma/puma[Puma]'s thread pool.
103107

104108
|`*PUMA_WORKERS*`
105-
|Indicates the number of worker processes that will be launched. See documentation on Puma's https://github.com/puma/puma#clustered-mode[clustered mode]. If not explicitly set, the default behavior sets `*PUMA_WORKERS*` to an appropriate value for the memory available to the container and the number of cores on the host.
109+
|This variable indicates the number of worker processes to be launched in Puma's
110+
link:https://github.com/puma/puma#clustered-mode[clustered mode] (when Puma runs
111+
more than two processes). If not explicitly set, the default behavior sets
112+
`*PUMA_WORKERS*` to a value that is appropriate for the memory available to the
113+
container and the number of cores on the host.
106114
|===
107115

108116
[[ruby-hot-deploy]]

0 commit comments

Comments
 (0)