Commit aa171af6 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Move some constants to the top of the script

parent ead60fe8

register.sh

+6 −3
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ set -eu 


declare -r CONFIG_BASE=/etc/gitlab-runner

declare -r CONFIG_FILE=${CONFIG_BASE}/registration.conf

declare -r DEFAULT_NAME=${HOSTNAME}/%02i

declare -r SYSTEMD_NAME=gitlab-runner

declare -r IMAGE=gitlab/gitlab-runner:latest



test -e ${CONFIG_FILE} &&

	source ${CONFIG_FILE}
@@ -76,7 +79,7 @@ done 
trap '{ echo; usage; } >&2' EXIT

set -- "${ARGS[@]}"

: ${TOKEN:=${1? A registration token is required}} \

  ${NAME:=${2-${HOSTNAME}/%i}} \

  ${NAME:=${2-${DEFAULT_NAME}}} \

  ${COORDINATOR_URL? Need COORDINATOR_URL in configs or environment, or --url} \

shift 2

if [[ $# -eq 0 ]]; then
@@ -90,7 +93,7 @@ mkdir -p --mode=0750 ${CONFIG_BASE} 
set_name() {

	local name=$(printf "${NAME}" ${1-})

	DEFAULT_DESCRIPTION=${name}

	SYSTEMD_UNIT=$(systemd-escape -m gitlab-runner@${name})

	SYSTEMD_UNIT=$(systemd-escape -m ${SYSTEMD_NAME}@${name})

	name=${SYSTEMD_UNIT%.service}

	RUNNER_CONFIG=${CONFIG_BASE}/${name#gitlab-runner@}.d

}
@@ -120,7 +123,7 @@ find_name() { 
find_name



docker run --rm -t -i -v ${RUNNER_CONFIG}:/etc/gitlab-runner \

	gitlab/gitlab-runner register \

	${IMAGE} register \

	--non-interactive \

	--url ${COORDINATOR_URL} \

	--registration-token ${TOKEN} \