From d345ba2e1dc594f59c4c1d9e4b1485b8e2418804 Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:02:27 -0700 Subject: [PATCH 1/9] workflow test - build runner image --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d063b87..3e487e2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,7 +8,7 @@ on: required: true jobs: docker: - runs-on: dz-runner-set + runs-on: ubuntu-latest # dz-runner-set container: docker.io/docker:latest services: dind: From 77a1e5bac8027d768f3c9803636811edf862923c Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:08:46 -0700 Subject: [PATCH 2/9] comment out qemu --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3e487e2..c63733c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -19,8 +19,8 @@ jobs: env: DOCKER_HOST: "tcp://localhost:2375" steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to GitHub From 9695c7071d80c7776a6660a01afb3b1a2cf12504 Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:12:55 -0700 Subject: [PATCH 3/9] rm dind --- .github/workflows/docker-image.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c63733c..3fcac88 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -9,15 +9,15 @@ on: jobs: docker: runs-on: ubuntu-latest # dz-runner-set - container: docker.io/docker:latest - services: - dind: - image: docker.io/docker:dind - options: "--entrypoint dockerd" - ports: - - 2375:2375 - env: - DOCKER_HOST: "tcp://localhost:2375" + # container: docker.io/docker:latest + # services: + # dind: + # image: docker.io/docker:dind + # options: "--entrypoint dockerd" + # ports: + # - 2375:2375 + # env: + # DOCKER_HOST: "tcp://localhost:2375" steps: # - name: Set up QEMU # uses: docker/setup-qemu-action@v3 From 0aef839bcc49351aa1fe73ae963c28bf6a48787f Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:52:15 -0700 Subject: [PATCH 4/9] add jq --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a58558..effdd7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Source: https://github.com/dotnet/dotnet-docker -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build +FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy AS build ARG TARGETOS=linux ARG TARGETARCH=amd64 @@ -44,6 +44,7 @@ RUN apt update -y \ && apt install -y sudo lsb-release gpg-agent software-properties-common \ git \ build-essential \ + jq \ && rm -rf /var/lib/apt/lists/* # Configure git-core/ppa based on guidance here: https://git-scm.com/download/linux From 31dd28b9eca6646e0f352f8f477a70435f0e3ae3 Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:54:16 -0700 Subject: [PATCH 5/9] set runner version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index effdd7e..18721b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy AS build ARG TARGETOS=linux ARG TARGETARCH=amd64 -ARG RUNNER_VERSION=2.317.0 +ARG RUNNER_VERSION=2.319.0 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1 ARG DOCKER_VERSION=25.0.5 ARG BUILDX_VERSION=0.15.1 From 283c90fc1ed9937c54ec1cc9d08e8da65914cf64 Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 09:55:33 -0700 Subject: [PATCH 6/9] keep static runner_version --- .github/workflows/docker-image.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3fcac88..a82111e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,11 +1,11 @@ name: Docker Image CI on: workflow_dispatch: - inputs: - runner_version: - description: Runner version - type: string - required: true + # inputs: + # runner_version: + # description: Runner version + # type: string + # required: true jobs: docker: runs-on: ubuntu-latest # dz-runner-set @@ -34,4 +34,4 @@ jobs: with: push: true tags: ghcr.io/${{ github.repository }}:${{ inputs.runner_version }},ghcr.io/${{ github.repository }}:latest - build-args: RUNNER_VERSION=${{ inputs.runner_version }} + # build-args: RUNNER_VERSION=${{ inputs.runner_version }} From 3acfefe65ee5d2c274faeea010d8d2d29dbe141f Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 10:01:35 -0700 Subject: [PATCH 7/9] update tags --- .github/workflows/docker-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index a82111e..bc26b60 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,5 +33,6 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: ghcr.io/${{ github.repository }}:${{ inputs.runner_version }},ghcr.io/${{ github.repository }}:latest + # tags: ghcr.io/${{ github.repository }}:,ghcr.io/${{ github.repository }}:latest + tags: ghcr.io/${{ github.repository }}:latest # build-args: RUNNER_VERSION=${{ inputs.runner_version }} From 548235acc116cbfdad674d77b048daea5f20ca9e Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 11:44:52 -0700 Subject: [PATCH 8/9] try dind image --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18721b9..c3ee0d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # Source: https://github.com/dotnet/dotnet-docker -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy AS build +# FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy AS build +FROM summerwind/actions-runner-dind:latest AS build ARG TARGETOS=linux ARG TARGETARCH=amd64 From fbb5620cd67789a084604389d6877faaea99f307 Mon Sep 17 00:00:00 2001 From: Christian Miller Date: Tue, 13 Aug 2024 12:07:46 -0700 Subject: [PATCH 9/9] switch to root user --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index c3ee0d6..a13410f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,8 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.1 ARG DOCKER_VERSION=25.0.5 ARG BUILDX_VERSION=0.15.1 +USER root + RUN apt update -y && apt install curl unzip -y WORKDIR /actions-runner