Skip to content

making the cartridge work again #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

making the cartridge work again #1

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
7 changes: 3 additions & 4 deletions .openshift/action_hooks/pre_build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ else
done

echo "Installing Vert.x $VERTX_VERSION"

echo " Downloading http://vertx.io/downloads/vert.x-${VERTX_VERSION}.tar.gz"
curl --insecure -o vert.x-${VERTX_VERSION}.tar.gz "http://vertx.io/downloads/vert.x-${VERTX_VERSION}.tar.gz"
tar -xf vert.x-${VERTX_VERSION}.tar.gz
echo " Downloading http://vert-x.github.io/vertx-downloads/downloads/-${VERTX_VERSION}.tar.gz"
curl --insecure -o vert.x-${VERTX_VERSION}.tar.gz "http://vert-x.github.io/vertx-downloads/downloads/vert.x-${VERTX_VERSION}.tar.gz"
tar -xzvf vert.x-${VERTX_VERSION}.tar.gz
rm vert.x-${VERTX_VERSION}.tar.gz
fi

Expand Down
3 changes: 1 addition & 2 deletions .openshift/action_hooks/start
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ cd $EXAMPLE_DIR
echo "Starting Vert.x application!"

if [[ -e $SERVER_FILE ]]; then
nohup bash -c "exec 'vertx' 'run' '${SERVER_FILE}' &> ${OPENSHIFT_LOG_DIR}vert.x.log" &> /dev/null &
echo $! > .openshift/application.pid
nohup bash -c "exec 'vertx' 'run' '${SERVER_FILE}' '-repo' 'vert-x.github.io' &> ${OPENSHIFT_DIY_LOG_DIR}vert.x.log" &> /dev/null &
else
echo "Server file does not exists."
fi
4 changes: 2 additions & 2 deletions js_example/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ var webServerConf = {

// Normal web server stuff

port: parseInt(vertx.env['OPENSHIFT_INTERNAL_PORT']),
host: vertx.env['OPENSHIFT_INTERNAL_IP'],
port: parseInt(vertx.env['OPENSHIFT_DIY_PORT']),
host: vertx.env['OPENSHIFT_DIY_IP'],
ssl: false, // OpenShift handles SSL for us

// Configuration for the event bus client side bridge
Expand Down
2 changes: 1 addition & 1 deletion rb_example/http_server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

HttpServer.new.request_handler do |req|
req.response.end("<html><body><h1>Hello from vert.x Ruby!</h1></body></html>")
end.listen(Integer(ENV['OPENSHIFT_INTERNAL_PORT']), ENV['OPENSHIFT_INTERNAL_IP'])
end.listen(Integer(ENV['OPENSHIFT_DIY_PORT']), ENV['OPENSHIFT_DIY_IP'])