From bd5c399d0d43d6be2c424a7e163ae2f9c14b137f Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 18:42:41 +0200 Subject: [PATCH 1/9] updated compose and docs --- .github/workflows/docker-build.yml | 2 +- .github/workflows/docker-test.yml | 2 +- README.md | 22 ++++++++++++++++++++++ docker-compose.yml | 11 +++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 22d5597..8da33ab 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -16,7 +16,7 @@ jobs: REPO: ${{ github.event.repository.name }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up QEM uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index 038c235..f5655dc 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -13,7 +13,7 @@ jobs: REPO: ${{ github.event.repository.name }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up QEM uses: docker/setup-qemu-action@v3 diff --git a/README.md b/README.md index 738fb08..98a9721 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,21 @@ You can set up the runner using either `docker run` or `docker-compose`. Choose - GITHUB_URL=https://github.com/ - RUNNER_TOKEN= - RUNNER_NAME= + - RUNNER_LABEL= volumes: - /var/run/docker.sock:/var/run/docker.sock restart: unless-stopped + # set runner resource limits [optional] + deploy: + resources: + limits: + cpus: "2.0" + memory: "4G" + reservations: + cpus: "0.5" + memory: "1024" + + ``` 3. **Docker Compose - Multi Containers** @@ -60,9 +72,19 @@ You can set up the runner using either `docker run` or `docker-compose`. Choose - GITHUB_URL=https://github.com/ - RUNNER_TOKEN= - RUNNER_NAME= + - RUNNER_LABEL= volumes: - /var/run/docker.sock:/var/run/docker.sock restart: unless-stopped + # set runner resource limits [optional] + deploy: + resources: + limits: + cpus: "2.0" + memory: "4G" + reservations: + cpus: "0.5" + memory: "1024" ``` 4. **Kubernetes Deployment** diff --git a/docker-compose.yml b/docker-compose.yml index 056e997..db09c70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,17 @@ services: - GITHUB_URL=https://github.com/ - RUNNER_TOKEN= - RUNNER_NAME= + - RUNNER_LABEL= volumes: - /var/run/docker.sock:/var/run/docker.sock restart: unless-stopped + # set runner resource limits [optional] + deploy: + resources: + limits: + cpus: "2.0" + memory: "4G" + reservations: + cpus: "0.5" + memory: "1024" + From 60f1cc46946d7aa639435e63909d169eef4ff0ea Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:06:53 +0200 Subject: [PATCH 2/9] updated compose and docs --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index be352f7..1cefa3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,14 +19,17 @@ RUN apt-get update && apt-get install -y \ tar \ nano \ sudo \ - software-properties-common && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* + software-properties-common + # apt-get clean && \ + # rm -rf /var/lib/apt/lists/* RUN curl -fsSL https://get.docker.com -o get-docker.sh && \ chmod +x get-docker.sh && \ sh get-docker.sh && \ - rm get-docker.sh + rm get-docker.sh \ + apt-get clean && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* RUN sudo chown root:docker /var/run/docker.sock || true WORKDIR /runner From 4fb12f1a0cc0bbffd8a413e2968ec8d1e44835dd Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:11:15 +0200 Subject: [PATCH 3/9] updated compose and docs --- Dockerfile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cefa3a..591c879 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,18 +19,24 @@ RUN apt-get update && apt-get install -y \ tar \ nano \ sudo \ - software-properties-common - # apt-get clean && \ - # rm -rf /var/lib/apt/lists/* - -RUN curl -fsSL https://get.docker.com -o get-docker.sh && \ - chmod +x get-docker.sh && \ - sh get-docker.sh && \ - rm get-docker.sh \ - apt-get clean && \ + software-properties-common && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + ca-certificates curl gnupg lsb-release && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ + apt-get update && \ + apt-get install -y docker-ce-cli + +# RUN curl -fsSL https://get.docker.com -o get-docker.sh && \ +# chmod +x get-docker.sh && \ +# sh get-docker.sh && \ +# rm get-docker.sh + RUN sudo chown root:docker /var/run/docker.sock || true WORKDIR /runner From 1ab3bb3482ed4614d7541012e3ee00b858d8bbb1 Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:13:41 +0200 Subject: [PATCH 4/9] updated compose and docs --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 591c879..97d017c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,7 @@ RUN apt-get update && apt-get install -y \ tar \ nano \ sudo \ - software-properties-common && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* + software-properties-common RUN apt-get update && apt-get install -y \ ca-certificates curl gnupg lsb-release && \ @@ -30,7 +28,9 @@ RUN apt-get update && apt-get install -y \ echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ apt-get update && \ - apt-get install -y docker-ce-cli + apt-get install -y docker-ce-cli && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # RUN curl -fsSL https://get.docker.com -o get-docker.sh && \ # chmod +x get-docker.sh && \ From a7e90f448a612d2dc1338ac04aeb2a9043ba6aef Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:17:19 +0200 Subject: [PATCH 5/9] updated compose and docs --- Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97d017c..a2ab58e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,16 +21,18 @@ RUN apt-get update && apt-get install -y \ sudo \ software-properties-common -RUN apt-get update && apt-get install -y \ - ca-certificates curl gnupg lsb-release && \ - mkdir -p /etc/apt/keyrings && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ - apt-get update && \ - apt-get install -y docker-ce-cli && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +RUN apt-get install -y docker-ce docker-ce-cli containerd.io + +# RUN apt-get update && apt-get install -y \ +# ca-certificates curl gnupg lsb-release && \ +# mkdir -p /etc/apt/keyrings && \ +# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ +# echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ +# $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ +# apt-get update && \ +# apt-get install -y docker-ce-cli && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* # RUN curl -fsSL https://get.docker.com -o get-docker.sh && \ # chmod +x get-docker.sh && \ From 6e25f8576c09042c811753e843eac707f0f375c2 Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:19:47 +0200 Subject: [PATCH 6/9] updated compose and docs --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2ab58e..9ec1afa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,10 @@ RUN apt-get update && apt-get install -y \ tar \ nano \ sudo \ - software-properties-common - -RUN apt-get install -y docker-ce docker-ce-cli containerd.io + software-properties-common \ + docker-ce \ + docker-ce-cli \ + containerd.io # RUN apt-get update && apt-get install -y \ # ca-certificates curl gnupg lsb-release && \ From ae35335b44a3ba5390c9b3349fcd77eee48e2e87 Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:21:56 +0200 Subject: [PATCH 7/9] updated compose and docs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ec1afa..787731c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \ software-properties-common \ docker-ce \ docker-ce-cli \ - containerd.io + containerd.io \ # RUN apt-get update && apt-get install -y \ # ca-certificates curl gnupg lsb-release && \ From 576dc2b55c2928721cba986fbf209dc5a3f5177d Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:25:20 +0200 Subject: [PATCH 8/9] updated compose and docs --- Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 787731c..c7187ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,25 +13,24 @@ ENV RUNNER_ARCH=${RUNNER_ARCH} ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y \ - curl \ - jq \ - git \ - tar \ - nano \ - sudo \ - software-properties-common \ - docker-ce \ - docker-ce-cli \ - containerd.io \ + curl jq git tar nano sudo software-properties-common \ + ca-certificates gnupg lsb-release && \ + mkdir -p /etc/apt/keyrings && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ + echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ + apt-get update && \ + apt-get install -y docker-ce-cli && \ + apt-get clean && rm -rf /var/lib/apt/lists/* # RUN apt-get update && apt-get install -y \ -# ca-certificates curl gnupg lsb-release && \ -# mkdir -p /etc/apt/keyrings && \ -# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \ -# echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ -# $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list && \ -# apt-get update && \ -# apt-get install -y docker-ce-cli && \ +# curl \ +# jq \ +# git \ +# tar \ +# nano \ +# sudo \ +# software-properties-common && \ # apt-get clean && \ # rm -rf /var/lib/apt/lists/* From 35d35657bb510bbb38c1cd4348e3e0bfdbf96f9c Mon Sep 17 00:00:00 2001 From: Chad Crouch Date: Thu, 11 Sep 2025 19:28:15 +0200 Subject: [PATCH 9/9] updated compose and docs --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7187ab..3d37f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,7 +61,8 @@ RUN ./bin/installdependencies.sh RUN useradd -m -s /bin/bash runner && \ echo "runner ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers -RUN usermod -aG docker runner && su - runner -c "newgrp docker" +RUN groupadd -f docker && usermod -aG docker runner +# RUN usermod -aG docker runner && su - runner -c "newgrp docker" RUN chown -R runner:runner /runner COPY entrypoint.sh /entrypoint.sh