Skip to content
Snippets Groups Projects
Commit 62f89243 authored by DJ Mountney's avatar DJ Mountney
Browse files

Updating Makefile to use pg_config to find and use the postgres bin directory

parent 21b8466a
No related branches found
No related tags found
1 merge request!9Use Postgres bin path
gitlab_repo = https://gitlab.com/gitlab-org/gitlab-ce.git
gitlab_shell_repo = https://gitlab.com/gitlab-org/gitlab-shell.git
gitlab_development_root = $(shell pwd)
postgres_bin_dir = $(shell pg_config --bindir)
 
all: gitlab-setup gitlab-shell-setup support-setup
 
Loading
Loading
@@ -60,7 +61,7 @@ support-setup: Procfile redis postgresql .bundle
@echo "***********************************"
 
Procfile:
sed "s|/home/git|${gitlab_development_root}|g" $@.example > $@
sed "s|/home/git|${gitlab_development_root}|g;s|postgres |${postgres_bin_dir}/postgres |" $@.example > $@
 
redis: redis/redis.conf
 
Loading
Loading
@@ -70,7 +71,7 @@ redis/redis.conf:
postgresql: postgresql/data/PG_VERSION
 
postgresql/data/PG_VERSION:
initdb -E utf-8 postgresql/data
${postgres_bin_dir}/initdb -E utf-8 postgresql/data
 
.bundle:
bundle install --jobs 4
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment