diff --git a/Dockerfile b/Dockerfile index b709dc8..311cc39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ -FROM ubuntu +FROM alpine:latest MAINTAINER Sean Gillespie # Install curl -RUN apt-get update && apt-get install -y curl +RUN apk update && apk add bash \ + ca-certificates \ + git \ + openssl \ + wget -# Add official gitlab repositories to APT -RUN curl \ - -L "https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh" \ - | bash +VOLUME /etc/gitlab-runner /home/gitlab-runner -# Install gitlab-runner -RUN apt-get install -y gitlab-ci-multi-runner - -VOLUME /etc/gitlab-runner /home/gitlab +RUN adduser -h /home/gitlab-runner -s /bin/bash -D gitlab-runner +RUN wget -q -O /usr/local/bin/gitlab-ci-multi-runner \ + https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-386 && \ + chmod +x /usr/local/bin/gitlab-ci-multi-runner # Add the entrypoint -ADD assets/entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh +COPY assets/entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] CMD ["run", "--working-directory=/home/gitlab-runner", "--user=gitlab-runner"] diff --git a/assets/entrypoint.sh b/assets/entrypoint.sh old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index 2f9f685..45fc433 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: REGISTRATION_TOKEN: ${REGISTRATION_TOKEN} RUNNER_EXECUTOR: docker RUNNER_TAG_LIST: docker + image: sgillespie/gitlab-runner network_mode: bridge links: - gitlab:gitlab