diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d063b87..bc26b60 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,26 +1,26 @@ 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: 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" + 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" 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 @@ -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 - build-args: RUNNER_VERSION=${{ inputs.runner_version }} + # tags: ghcr.io/${{ github.repository }}:,ghcr.io/${{ github.repository }}:latest + tags: ghcr.io/${{ github.repository }}:latest + # build-args: RUNNER_VERSION=${{ inputs.runner_version }} diff --git a/Dockerfile b/Dockerfile index 3a58558..a13410f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,16 @@ # 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 -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 +USER root + RUN apt update -y && apt install curl unzip -y WORKDIR /actions-runner @@ -44,6 +47,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