diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml index 0aa2be0397b..61e706a4a6c 100644 --- a/.github/workflows/publish-image.yml +++ b/.github/workflows/publish-image.yml @@ -9,7 +9,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: field-control/actions-runner + IMAGE_NAME: fieldcontrol/actions-runner jobs: build: @@ -64,5 +64,5 @@ jobs: push: true labels: | org.opencontainers.image.source=${{github.server_url}}/${{github.repository}} - org.opencontainers.image.description=https://github.com/actions/runner/releases/tag/v${{ steps.image.outputs.version }} + org.opencontainers.image.description=https://github.com/FieldControl/runner/releases/tag/v${{ steps.image.outputs.version }} org.opencontainers.image.licenses=MIT diff --git a/images/Dockerfile b/images/Dockerfile index 2db7da24698..90de9f3edd1 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -1,9 +1,9 @@ # Source: https://github.com/dotnet/dotnet-docker FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-jammy as build -ARG TARGETOS -ARG TARGETARCH -ARG RUNNER_VERSION +ARG TARGETOS=linux +ARG TARGETARCH=arm64 +ARG RUNNER_VERSION=1.0.0 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.5.0 ARG DOCKER_VERSION=24.0.6 ARG BUILDX_VERSION=0.11.2 @@ -48,11 +48,23 @@ RUN apt-get update -y \ jq \ git \ lsb-release \ + build-essential \ + ca-certificates \ + gnome-terminal \ + unzip \ + zip \ + wget \ && rm -rf /var/lib/apt/lists/* -RUN curl -o- -L https://yarnpkg.com/install.sh | bash \ +# Install yarn +RUN (curl -o- -L https://yarnpkg.com/install.sh | bash) || true \ && export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" +RUN mkdir -p /tmp/aws \ + && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/aws/awscliv2.zip" \ + && unzip /tmp/aws/awscliv2.zip -d /tmp/aws \ + && sudo /tmp/aws/aws/install + RUN adduser --disabled-password --gecos "" --uid 1001 runner \ && groupadd docker --gid 123 \ && usermod -aG sudo runner \ @@ -60,6 +72,14 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \ && echo "%sudo ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \ && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers +# Install docker +RUN install -m 0755 -d /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \ + && chmod a+r /etc/apt/keyrings/docker.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ + && apt-get update -y \ + && apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + WORKDIR /home/runner COPY --chown=runner:docker --from=build /actions-runner . diff --git a/releaseVersion b/releaseVersion index afaf360d37f..7f207341d5d 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file diff --git a/src/runnerversion b/src/runnerversion index afaf360d37f..7f207341d5d 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file