Skip to content

fixes for #226 #227 #228 #229

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
iMingLei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes for #226 #227 #228 #229

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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ To start/stop/restart Oracle run the following commands:
```

## APEX
To connect to APEX go to `http://<server_name>/` or `https://<server_name>/` and it will direct you to the APEX login page.
Typically, to connect to APEX from host go to `http://<server_name>:<host_port>/` or `https://<server_name>:<host_port>/` and it will direct you to the APEX login page. Please check [Vagrant Port Mapping](#vagrant-port-mapping) for host port.

Workspace | Username | Password | Description
------ | ------ | ------ | ------
Expand Down
3 changes: 3 additions & 0 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ Vagrant.configure(2) do |config|
config.vm.provision "shell", inline: <<-SHELL
export OOS_DEPLOY_TYPE="VAGRANT"

#226: fix DNS related error with vagrant build
echo "nameserver 8.8.8.8" >> /etc/resolv.conf

if [ -n "$(command -v yum)" ]; then
echo; echo \* Installing rsync with yum \*
yum install rsync -y
Expand Down
3 changes: 2 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@ fi


#Install ratom
#228: fix unhandled 'which' stderror prompt during vagrant build
. ${OOS_UTILS_DIR}/echo_title.sh "Installing ratom"
if [ "$(which ratom)" == "" ]; then
if [ "$(which ratom 2> /dev/null)" == "" ]; then
cd $OOS_SOURCE_DIR
eval "source ./scripts/ratom.sh $OOS_LOG_OPTIONS"
else
Expand Down
3 changes: 2 additions & 1 deletion scripts/packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ if [ "$OOS_MODULE_NODEJS" = "Y" ]; then
# fi

#13: Bower support (since node.js will be installed by default)
#228: fix unhandled 'which' stderror prompt during vagrant build
echo; echo \* Installing Bower \*; echo
if [ "$(which bower)" == "" ]; then
if [ "$(which bower 2> /dev/null)" == "" ]; then
npm install -g bower
else
echo bower already installed
Expand Down
3 changes: 2 additions & 1 deletion utils/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ fi
# Adapted from: http://stackoverflow.com/questions/12451278/bash-capture-stdout-to-a-variable-but-still-display-it-in-the-console
echo "Requesting to download file ${download_path}"
#127: Added -L option to help assist with dropbox.com links.
DOWNLOAD_OUTPUT=$(curl -L -O -C - ${download_path} --progress-bar 2> >(tee /dev/tty))
#227: fix tee /dev/tty error
DOWNLOAD_OUTPUT=$(curl -L -O -C - ${download_path} --progress-bar 2> >(tee ${OOS_ERROR_LOG} --append))

exit_code=$?
if [[ $exit_code = 0 ]]; then
Expand Down