Skip to content
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

Jump to bottom

Remove duplicate postgres startup #11793 (rebased onto dev_4_4) #1882

Merged
merged 5 commits into from
Dec 9, 2013
Merged

Remove duplicate postgres startup #11793 (rebased onto dev_4_4) #1882

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccb6b7f
Remove duplicate postgres startup
manics Dec 5, 2013
a9c2ce0
brew services doesn't seem to work, use pg_ctl instead
manics Dec 5, 2013
405ad4d
Pass -w to pg_ctl so that it waits for server to start
manics Dec 6, 2013
53ba359
killall postgres
manics Dec 6, 2013
242270e
Remove killall postgres, put it in the jenkins config instead
manics Dec 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/hudson/OMERO-homebrew-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,14 @@ export PYTHONPATH=$(bin/brew --prefix omero)/lib/python:$ICE_HOME/python
export PATH=$(bin/brew --prefix)/bin:$(bin/brew --prefix)/sbin:/usr/local/lib/node_modules:$ICE_HOME/bin:$PATH
export DYLD_LIBRARY_PATH=$ICE_HOME/lib:$ICE_HOME/python:${DYLD_LIBRARY_PATH-}

# Note: If postgres startup fails it's probably because there was an old
# process still running.
# Create PostgreSQL database
if [ -d "$PSQL_DIR" ]; then
rm -rf $PSQL_DIR
fi
bin/initdb $PSQL_DIR
bin/brew services restart postgresql
bin/pg_ctl -D $PSQL_DIR -l $PSQL_DIR/server.log start
bin/pg_ctl -D $PSQL_DIR -l $PSQL_DIR/server.log -w start

# Create user and database
bin/createuser -w -D -R -S db_user
Expand Down