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

fix docker build by adding missing dependencies and skipping munin config #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix docker build by adding missing dependencies and skipping munin config #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32930a3
add packages needed for osmosis and osm2pgsql install
melvinzhang Sep 14, 2015
3b51a61
skip munin configuration in docker as munin is not installed
melvinzhang Sep 14, 2015
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
10 changes: 9 additions & 1 deletion run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if [ ! -L "${osmosisBinary}" ]; then
apt-get update > /dev/null

# Osmosis requires java
apt-get -y install openjdk-7-jre
apt-get -y install wget openjdk-7-jre

# Create folder
mkdir -p /usr/local/osmosis
Expand Down Expand Up @@ -174,6 +174,11 @@ apt-get -y install libprotobuf-c0-dev protobuf-c-compiler
# Additional packages
# bc is needed in configPostgresql.sh
apt-get -y install bc apache2 git autoconf-archive
# needed by osm2pgsql, see https://github.com/openstreetmap/osm2pgsql/blob/master/README.md
apt-get -y install autoconf automake libtool make g++ pkg-config libboost-dev \
libboost-system-dev libboost-filesystem-dev libboost-thread-dev libexpat1-dev \
libgeos-dev libgeos++-dev libpq-dev libbz2-dev libproj-dev zlib1g-dev \
lua5.2 liblua5.2-dev

# Install gdal, needed for US Tiger house number data
# !! More steps need to be added to this script to support that US data
Expand All @@ -193,6 +198,8 @@ service postgresql restart

# Nominatim munin
# !! Look at the comments at the top of the nominatim_importlag file in the following and copy the setup section to a new file in: /etc/munin/plugin-conf.d/
# skip if doing a Docker install as munin is not installed via run.sh
if [ -z "${dockerInstall}" ]; then
ln -s '/home/nominatim/Nominatim/munin/nominatim_importlag' '/etc/munin/plugins/nominatim_importlag'
ln -s '/home/nominatim/Nominatim/munin/nominatim_query_speed' '/etc/munin/plugins/nominatim_query_speed'
ln -s '/home/nominatim/Nominatim/munin/nominatim_nominatim_requests' '/etc/munin/plugins/nominatim_nominatim_requests'
Expand All @@ -202,6 +209,7 @@ ln -s '/home/nominatim/Nominatim/munin/nominatim_nominatim_requests' '/etc/munin
apt-get -y install libdbd-pg-perl
munin-node-configure --shell | grep postgres | sh
service munin-reload restart
fi


# We will use the Nominatim user's homedir for the installation, so switch to that
Expand Down