Skip to content

Commit

Permalink
improved readme
Browse files Browse the repository at this point in the history
  • Loading branch information
opensas committed Mar 30, 2012
1 parent 7e21c44 commit 0ae4be6
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .openshift/action_hooks/load_config
@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash


# debug # debug
# set -x # set -x
Expand Down
2 changes: 1 addition & 1 deletion .openshift/action_hooks/start
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# The logic to start up your application should be put in this # The logic to start up your application should be put in this
# script. The application will work only if it binds to # script. The application will work only if it binds to
# $OPENSHIFT_INTERNAL_IP:8080 # $OPENSHIFT_INTERNAL_IP:8080




# loads $PLAY_PARAMS # loads $PLAY_PARAMS
Expand Down
2 changes: 1 addition & 1 deletion .openshift/action_hooks/stop
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# The logic to stop your application should be put in this script. # The logic to stop your application should be put in this script.


# debug # debug
# set -x # set -x


LOG_FILE="${OPENSHIFT_LOG_DIR}play.log" LOG_FILE="${OPENSHIFT_LOG_DIR}play.log"
Expand Down
19 changes: 10 additions & 9 deletions README.md
Expand Up @@ -25,19 +25,20 @@ You will see something like the following:
Confirming application 'play2demo' is available: Success! Confirming application 'play2demo' is available: Success!


play2demo published: http://play2demo-opensas.rhcloud.com/ play2demo published: http://play2demo-opensas.rhcloud.com/
git url: ssh://uuis@play2demo-yourdomain.rhcloud.com/~/git/play2demo.git/ git url: ssh://uuid@play2demo-yourdomain.rhcloud.com/~/git/play2demo.git/
Disclaimer: This is an experimental cartridge that provides a way to try unsupported languages, frameworks, and middleware on Openshift.
``` ```


Copy paste the git url to add it as a remote repo Copy and paste the git url to add it as a remote repo (replace the uuid part with your own!)

git remote add origin ssh://uuid@play2demo-yourdomain.rhcloud.com/~/git/play2demo.git/
git pull -s recursive -X theirs origin master
git add .
git commit -m "initial deploy"


git remote add origin ssh://uuis@play2demo-yourdomain.rhcloud.com/~/git/play2demo.git/ And then this repository as quickstart:
git pull origin

And then this repository as upstream:


git remote add upstream -m master git://github.com/opensas/play2-openshift-quickstart.git git remote add quickstart -m master git://github.com/opensas/play2-openshift-quickstart.git
git pull -s recursive -X theirs upstream master git pull -s recursive -X theirs quickstart master


Then use the stage task to prepare your deployment Then use the stage task to prepare your deployment


Expand Down
0 rhc_deploy → openshift_deploy 100644 → 100755
File renamed without changes.

0 comments on commit 0ae4be6

Please sign in to comment.