Commit 3e08f8be authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Refactor container creation/destruction into funcs

parent e0915395

register.sh

+22 −13
Original line number Diff line number Diff line
@@ -151,6 +151,26 @@ find_name() { 
	exit 1

}



container_new() {

	echo >&2 "Starting ${CONTAINER_NAME}"

	docker container create \

		--name ${CONTAINER_NAME} \

		--restart always \

		--volume ${RUNNER_CONFIG}:/etc/gitlab-runner \

		--volume /run/docker.sock:/run/docker.sock \

		${IMAGE}

	docker container start \

		${CONTAINER_NAME}

} >/dev/null



container_rm() {

	echo >&2 "Stopping ${CONTAINER_NAME}"

	docker container stop \

		${CONTAINER_NAME}

	docker container rm \

		${CONTAINER_NAME}

} >/dev/null



case $COMMAND in

	register)

		find_name
@@ -173,27 +193,16 @@ case $COMMAND in 
		sed -i '/\[runners\.custom_build_dir\]/{$!N;/\n\s*\[/!P;D}' \

			${RUNNER_CONFIG}/config.toml



		docker container create \

			--name ${CONTAINER_NAME} \

			--restart always \

			--volume ${RUNNER_CONFIG}:/etc/gitlab-runner \

			--volume /run/docker.sock:/run/docker.sock \

			${IMAGE}

		docker container start \

			${CONTAINER_NAME}

		container_new

		;;



	unregister)

		NAME=${RUNNER_NAME:?} set_name



		docker container stop \

			${CONTAINER_NAME}

		docker container rm \

			${CONTAINER_NAME}

		container_rm

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

			${IMAGE} unregister --name ${RUNNER_NAME}





		rm -r ${RUNNER_CONFIG:?}

		;;

esac