Commit 30918257 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'update_workhorse' into 'master'

Add option to update gitlab-workhorse

Already tested on my kit :)

See merge request !91
parents 5545e643 be763bdc
......@@ -66,7 +66,7 @@ gitlab-runner-clean:
# Update gitlab, gitlab-shell and gitlab-runner
update: gitlab-update gitlab-shell-update gitlab-runner-update
update: gitlab-update gitlab-shell-update gitlab-runner-update gitlab-workhorse-update
gitlab-update: gitlab/.git/pull
cd ${gitlab_development_root}/gitlab && \
......@@ -125,12 +125,19 @@ postgresql/data/PG_VERSION:
gitlab-workhorse-setup: gitlab-workhorse/gitlab-workhorse
gitlab-workhorse-update: gitlab-workhorse/.git/pull
make
gitlab-workhorse/gitlab-workhorse: gitlab-workhorse/.git
cd gitlab-workhorse && make
cd ${gitlab_development_root}/gitlab-workhorse && make
gitlab-workhorse/.git:
git clone ${gitlab_workhorse_repo} gitlab-workhorse
gitlab-workhorse/.git/pull:
cd ${gitlab_development_root}/gitlab-workhorse && \
git pull --ff-only
nginx-setup: nginx/conf/nginx.conf nginx/logs nginx/tmp
nginx/conf/nginx.conf:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment