diff --git a/openshift_sti_images/nodejs.adoc b/openshift_sti_images/nodejs.adoc index 448cc80be025..be139a25640a 100644 --- a/openshift_sti_images/nodejs.adoc +++ b/openshift_sti_images/nodejs.adoc @@ -125,7 +125,7 @@ If you omit the `VERSION` parameter, the build/test action is performed on all s |[filename]#save-artifacts# |This script archives all dependent modules in this image in order to perform an incremental build. An incremental build reuses the build artifacts from a previously-built image to create a new image. -|`nodejs-version/nodejs/` +|`nodejs-version/contrib/` | |This folder contains files with commonly used modules. @@ -149,10 +149,3 @@ If you omit the `VERSION` parameter, the build/test action is performed on all s | |This folder contains scripts responsible for building and testing actions performed by the [filename]#Makefile#. |=== - -== Environment Variables - -* [envvar]#APP_ROOT# - This variable specifies a relative location to your application inside the application GIT repository. If your application is located within a sub-folder, you can set this variable to `./[replaceable]##`. - -* [envvar]#STI_SCRIPTS_URL# - This variable specifies the location of the directory from which the [filename]#assemble#, [filename]#run#, and [filename]#save-artifacts# scripts are downloaded or copied. By default, OpenShift uses the scripts in this repository; however, you can provide an alternative location and run your own scripts. - - Default https://raw.githubusercontent.com/openshift/sti-nodejs/master/0.10/.sti/bin[/.sti/bin] diff --git a/openshift_sti_images/ruby.adoc b/openshift_sti_images/ruby.adoc index f60e4eb30855..830cc871f3ed 100644 --- a/openshift_sti_images/ruby.adoc +++ b/openshift_sti_images/ruby.adoc @@ -122,7 +122,7 @@ If you omit the `VERSION` parameter, the build/test action is performed on all s |[filename]#run# |This script is responsible for using the application web server to run the application. -|`/ruby-version/ruby/` +|`/ruby-version/contrib/` | |This folder contains files with commonly used modules. @@ -173,6 +173,9 @@ openshift/ruby-20-rhel7 == Environment Variables +To set these environment variables, you can place them into `.sti/environment` +file inside your source code repository. + * [envvar]#RACK_ENV# - This variable specifies the environment within which the Ruby application is deployed; for example, `production`, `development`, or `test`. Each level has different behavior in terms of logging verbosity, error pages, and ruby gem installation. The application assets are only compiled if [envvar]#RACK_ENV# is set to `production`. * [envvar]#RAILS_ENV# - This variable specifies the environment within which the Ruby on Rails application is deployed; for example, `production`, `development`, or `test`. Each level has different behavior in terms of logging verbosity, error pages, and ruby gem installation. The application assets are only compiled if [envvar]#RAILS_ENV# is set to `production`.