diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f36b62ac6b4a0ab5d21d7008f2c328e09c94314a..9c8f1b856ee6860e9d6216f14b69f46ce15432c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ docker-build: image: # An alpine-based image with the `docker` CLI installed. - name: docker:stable + name: docker:19.03.12 # This will run a Docker daemon in a container (Docker-In-Docker), which will # be available at thedockerhost:2375. If you make e.g. port 5000 public in Docker @@ -30,7 +30,7 @@ docker-build: # # CHANGEME: You can use some other Docker registry though by changing the # login and image name. - - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" + - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY" - docker build -t "$CI_REGISTRY_IMAGE" . - docker push "$CI_REGISTRY_IMAGE" diff --git a/run-runner.sh b/run-runner.sh index bea6b34ec7dc593224696c6ae5c94b2ace24a4e4..9b8688052c06de4493432de83dfa539f6096f64a 100644 --- a/run-runner.sh +++ b/run-runner.sh @@ -1,18 +1,10 @@ #!/bin/bash -# --restart always - -docker run -d --name gitlab-runner --restart unless-stopped -v /srv/gitlab-runner/config:/etc/gitlab-runner -v /var/run/docker.sock:/var/run/docker.sock gitlab/gitlab-runner:latest - -# #System volume -# docker run --rm -it -v /srv/gitlab-runner/config:/etc/gitlab-runner gitlab/gitlab-runner register -# #Docker volume -# #docker run --rm -it -v gitlab-runner-config:/etc/gitlab-runner gitlab/gitlab-runner:latest register - -sudo gitlab-runner register \ - --url "https://git-ce.rwth-aachen.de/" \ - --registration-token "GR1348941g1nyq5UHChraBCy7SsxU" \ - --description "docker-ruby:2.6" \ - --executor "docker" \ - --template-config /tmp/test-config.template.toml \ - --docker-image ruby:2.6 \ No newline at end of file +docker run --rm -it -v gitlab-runner-config:/etc/gitlab-runner gitlab/gitlab-runner:latest register +token=https://git-ce.rwth-aachen.de/ +token=GR1348941g1nyq5UHChraBCy7SsxU + +docker run -d --name gitlab-runner --restart always \ + -v /srv/gitlab-runner/config:/etc/gitlab-runner \ + -v /var/run/docker.sock:/var/run/docker.sock \ + gitlab/gitlab-runner:latest \ No newline at end of file