diff --git a/.github/workflows/test.yml b/.github/workflows/test-self-hosted.yml similarity index 55% rename from .github/workflows/test.yml rename to .github/workflows/test-self-hosted.yml index 51bebad..218c41f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test-self-hosted.yml @@ -1,4 +1,4 @@ -name: "Docker and container hooks test" +name: "Test self-hosted runner" on: workflow_dispatch: @@ -10,10 +10,5 @@ jobs: container: image: docker:dind steps: - - name: Show docker info - run: | - docker -v - docker info - docker ps - run: ls - run: pwd \ No newline at end of file diff --git a/self-hosted-runner/Dockerfile b/self-hosted-runner/Dockerfile index 6a940fc..63bff4c 100644 --- a/self-hosted-runner/Dockerfile +++ b/self-hosted-runner/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends\ software-properties-common \ && rm -rf /var/lib/apt/lists/* -# Install Docker cli +# Install Docker RUN install -m 0755 -d /etc/apt/keyrings \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \ && chmod a+r /etc/apt/keyrings/docker.asc \ diff --git a/self-hosted-runner/compose.yml b/self-hosted-runner/compose.yml index 7790c26..a1c4162 100644 --- a/self-hosted-runner/compose.yml +++ b/self-hosted-runner/compose.yml @@ -12,3 +12,5 @@ services: TARGET_ARCH: x64 volumes: - /var/run/docker.sock:/var/run/docker.sock + group_add: + - "${DOCKER_GID}" diff --git a/self-hosted-runner/env.template b/self-hosted-runner/env.template index bc955d4..a6bfb2a 100644 --- a/self-hosted-runner/env.template +++ b/self-hosted-runner/env.template @@ -1 +1,2 @@ -PERSONAL_ACCESS_TOKEN= \ No newline at end of file +PERSONAL_ACCESS_TOKEN= +DOCKER_GID= \ No newline at end of file