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/Dockerfile b/Dockerfile index be352f7..3d37f08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,20 +13,31 @@ 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 && \ - 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 + 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 \ +# curl \ +# jq \ +# git \ +# 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 RUN sudo chown root:docker /var/run/docker.sock || true WORKDIR /runner @@ -50,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 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" +