Changed register implementation (multi paging)

When there was more then 20 runners (default page size in Gitlab API)
finding runner by description failed if it was not on the first page.

removed gitlab_functions.sh, it was hard to support multi page calls

New implementation is located in:

https://github.com/FlakM/gitlab-runner-cleaner

Closes #4
Closes #5

.gitignore

@@ -0,0 +1 @@
+/.temp

Dockerfile

@@ -14,10 +14,13 @@ RUN apt-get update -y && \
 RUN curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash
 RUN apt-get -y install gitlab-runner
 
+RUN curl -LJO https://github.com/FlakM/gitlab-runner-cleaner/releases/download/0.0.2/gitlab-runner-cleaner.sh && \
+    chmod +x gitlab-runner-cleaner.sh
+
 ADD entrypoint.sh /
-ADD gitlab_functions.sh /
 
-RUN chmod +x /entrypoint.sh /gitlab_functions.sh
+
+RUN chmod +x /entrypoint.sh
 
 ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
 CMD ["run", "--user=gitlab-runner", "--working-directory=/home/gitlab-runner"]

README.md

@@ -9,7 +9,7 @@ The default image needs additional step of executing script from outside of cont
 | tag               | version       |
 | ---------------   | --------------|
 | `0.0.3`           | 10.2.0        |
-| `0.0.4`-`0.0.6`   | 10.4.0        |
+| `0.0.4`-`0.0.9`   | 10.4.0        |
 
 
 # Running instructions
@@ -70,7 +70,7 @@ docker exec -i gitlab-runner gitlab-runner register
 |`DOCKER_PRIVILEGED`    |  should you need to run in priviliged mode set to true (otherwise defaults to false)                                                     | false                           | false         |           
 |`REGISTER_LOCKED`      |  should this runner be locked to this project or not                                                                                     | true                            | false         |
 |`ADMIN_TOKEN`          |  access token with admin privilages (if specified runner will be registered for projects`PROJECTS_TO_REGISTER`)                          |                                 | false         |
-|`PROJECTS_TO_REGISTER` |  project ids seperated by `;`                                                                                                            |                                 | false         |
+|`PROJECTS_TO_REGISTER` |  project ids seperated by `,` or `;`                                                                                                     |                                 | false         |
 |`CUSTOM_RUNNER_NAME`   |  runner's description                                                                                                                    | `$HOSTNAME`                     | false         |
 |`DOCKER_VOLUMES`       |  volume mounted by this runner                                                                                                           |                                 | false         |
 |`DOCKER_IMAGE`         |  docker image to use                                                                                                                     | docker:18.01.0-ce               | true          |

entrypoint.sh

@@ -15,7 +15,7 @@ fi
 
 if [ "$ADMIN_TOKEN" != "" ]; then
   REGISTER_OTHER_PROJECTS="true"
-  PROJECTS_STRING="$PROJECTS_TO_REGISTER"
+  PROJECTS_STRING=`echo "$PROJECTS_TO_REGISTER" | tr ";" ","`
 fi
 
 MY_NAME="${CUSTOM_RUNNER_NAME:-$HOSTNAME}"
@@ -56,16 +56,9 @@ fi
 
 
 if [ "$REGISTER_OTHER_PROJECTS" == "true" ]; then
-  source ./gitlab_functions.sh
-  RUNNER_ID=$(getRunnerIdByDescription "$RUNNER_NAME" "$CI_SERVER_URL" "$ADMIN_TOKEN")
-
-  projects=$(echo "$PROJECTS_STRING" | tr ";" "\n")
-
-  for PROJECT_ID in $projects
-  do
-      echo "registering runner $RUNNER_ID to [$PROJECT_ID]"
-      registerRunnerToProject "$RUNNER_ID" "$PROJECT_ID" "$CI_SERVER_URL" "$ADMIN_TOKEN"
-  done  
+  export GITLAB_TOKEN="$ADMIN_TOKEN"
+
+  ./gitlab-runner-cleaner.sh register "$RUNNER_NAME" --byId=false --projects "$PROJECTS_STRING"
 fi