Skip to content

Fix 'contrib' directory in images and mention .sti/environment #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adellape merged 1 commit into from
Feb 25, 2015
Merged

Fix 'contrib' directory in images and mention .sti/environment #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions openshift_sti_images/nodejs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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]#<test-app>#`.

* [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[<nodejs-version>/.sti/bin]
5 changes: 4 additions & 1 deletion openshift_sti_images/ruby.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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`.
Expand Down