Extend official actions/runner image #123

int128 · 2023-09-23T09:39:03Z

Problem to solve

Currently, we need to maintain our Dockerfile. It would be nice to extend the official image for less maintenance effort.

How to solve

Since the official image supports both x86 and arm64 as actions/runner#2601, we can extend it.

It does not provide ubuntu20 image officially, we still need to maintain our Dockerfile for ubuntu20.

Changes

Docker version will be updated from 20.10.23 to 23.0.6
https://github.com/actions/runner-container-hooks will be updated from 0.3.1 to 0.3.2

github-actions · 2023-09-23T09:39:16Z

⚠️ If you need to release this change, create a next release after merge.

github-actions · 2023-09-23T09:42:23Z

⚠️ If you need to release this change, create a next release after merge.

github-actions · 2023-09-24T04:44:10Z

⚠️ If you need to release this change, create a next release after merge.

github-actions · 2023-09-24T05:12:12Z

⚠️ If you need to release this change, create a next release after merge.

int128 · 2023-09-24T05:17:05Z

Dockerfile.ubuntu20

+RUN adduser --disabled-password --gecos "" --uid 1001 runner \
+    && groupadd docker --gid 123 \
+    && usermod -aG sudo runner \
+    && usermod -aG docker runner \
+    && echo "%sudo   ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \
+    && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers


Same as https://github.com/actions/runner/blob/bdfef345577cb66994787a4166e717744da6379f/images/Dockerfile#L42-L47

int128 · 2023-09-24T05:17:31Z

Dockerfile.ubuntu20

+RUN export RUNNER_ARCH=${TARGETARCH} \
+    && if [ "$RUNNER_ARCH" = "amd64" ]; then export RUNNER_ARCH=x64 ; fi \
+    && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \
+    && tar xzf ./runner.tar.gz \
+    && rm runner.tar.gz
+
+RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \
+    && unzip ./runner-container-hooks.zip -d ./k8s \
+    && rm runner-container-hooks.zip
+
+RUN export RUNNER_ARCH=${TARGETARCH} \
+    && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \
+    && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \
+    && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \
+    && tar zxvf docker.tgz \
+    && rm -rf docker.tgz \
+    && install -o root -g root -m 755 docker/* /usr/bin/ \
+    && rm -rf docker


Same as https://github.com/actions/runner/blob/bdfef345577cb66994787a4166e717744da6379f/images/Dockerfile#L13-L28
https://github.com/actions/runner/blob/bdfef345577cb66994787a4166e717744da6379f/images/Dockerfile#L53

int128 · 2023-09-24T05:26:39Z

Dockerfile.ubuntu20

Diff to the original https://github.com/quipper/actions-runner/blob/ade121bd15970cb70810e29987e76ef1c74c2157/Dockerfile

# git diff 2a8b981 a847604 | pbcopy diff --git a/2a8b981 b/a847604 index 2a8b981..a847604 100644 --- a/2a8b981 +++ b/a847604 @@ -1,10 +1,10 @@ -ARG BASE_IMAGE_OS=jammy -FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-${BASE_IMAGE_OS} +FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-focal +ARG TARGETOS ARG TARGETARCH ARG RUNNER_VERSION=2.309.0 -ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.1 -ARG DOCKER_VERSION=20.10.23 +ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2 +ARG DOCKER_VERSION=23.0.6 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y \ @@ -36,7 +36,7 @@ RUN apt-get update -y \ # keep /var/lib/apt/lists to reduce time of apt-get update in a job # set up the runner environment, -# based on https://github.com/actions/runner/blob/v2.304.0/images/Dockerfile +# based on https://github.com/actions/runner/blob/v2.309.0/images/Dockerfile RUN adduser --disabled-password --gecos "" --uid 1001 runner \ && groupadd docker --gid 123 \ && usermod -aG sudo runner \ @@ -45,9 +45,9 @@ RUN adduser --disabled-password --gecos "" --uid 1001 runner \ && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers WORKDIR /home/runner -RUN RUNNER_ARCH=x64 \ - && if [ "$TARGETARCH" = "arm64" ]; then RUNNER_ARCH=arm64 ; fi \ - && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \ +RUN export RUNNER_ARCH=${TARGETARCH} \ + && if [ "$RUNNER_ARCH" = "amd64" ]; then export RUNNER_ARCH=x64 ; fi \ + && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \ && tar xzf ./runner.tar.gz \ && rm runner.tar.gz @@ -55,9 +55,10 @@ RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-c && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip -RUN DOCKER_ARCH=x86_64 \ - && if [ "$TARGETARCH" = "arm64" ]; then DOCKER_ARCH=aarch64 ; fi \ - && curl -fLo docker.tgz https://download.docker.com/linux/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \ +RUN export RUNNER_ARCH=${TARGETARCH} \ + && if [ "$RUNNER_ARCH" = "amd64" ]; then export DOCKER_ARCH=x86_64 ; fi \ + && if [ "$RUNNER_ARCH" = "arm64" ]; then export DOCKER_ARCH=aarch64 ; fi \ + && curl -fLo docker.tgz https://download.docker.com/${TARGETOS}/static/stable/${DOCKER_ARCH}/docker-${DOCKER_VERSION}.tgz \ && tar zxvf docker.tgz \ && rm -rf docker.tgz \ && install -o root -g root -m 755 docker/* /usr/bin/ \ @@ -73,8 +74,7 @@ VOLUME /var/lib/docker # some setup actions depend on ImageOS variable # https://github.com/actions/runner-images/issues/345 -ARG ImageOS=ubuntu22 -ENV ImageOS=${ImageOS} +ENV ImageOS=ubuntu20 USER runner ENTRYPOINT ["/usr/bin/tini", "--", "/entrypoint.sh"]

arch/armの部分に関してはやりたいことは同じと読み取ったのですが、
originalに寄せなかった理由はなにかあるでしょうか？
（もしうまく読み取れていなかったらすみません）

説明不足でした 🙏
上記は main ブランチの Dockerfile との差分です。
差分となっている部分が original (actions/runner) からコピーした部分です

github-actions · 2023-09-24T06:36:04Z

⚠️ If you need to release this change, create a next release after merge.

int128 · 2023-09-24T06:43:10Z

Dockerfile.ubuntu20

+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
+ARG DOCKER_VERSION=23.0.6


Bump the versions as https://github.com/actions/runner/blob/bdfef345577cb66994787a4166e717744da6379f/images/Dockerfile#L7-L8

int128 · 2023-09-24T06:55:41Z

Dockerfile

-    && apt-get install -y --no-install-recommends \
-        sudo \
+# extends https://github.com/actions/runner/blob/main/images/Dockerfile
+FROM ghcr.io/actions/actions-runner:${RUNNER_VERSION}


Built from https://github.com/actions/runner/blob/v2.309.0/images/Dockerfile

📝 Dockerfile of base image

https://github.com/actions/runner/blob/main/images/Dockerfile

44smkn

:lgtm:

44smkn · 2023-09-26T01:20:07Z

Dockerfile

-    && apt-get install -y --no-install-recommends \
-        sudo \
+# extends https://github.com/actions/runner/blob/main/images/Dockerfile
+FROM ghcr.io/actions/actions-runner:${RUNNER_VERSION}


📝 Dockerfile of base image

https://github.com/actions/runner/blob/main/images/Dockerfile

44smkn · 2023-09-26T01:24:49Z

Dockerfile


 COPY entrypoint.sh /

 VOLUME /var/lib/docker

 # some setup actions depend on ImageOS variable
 # https://github.com/actions/runner-images/issues/345
-ARG ImageOS=ubuntu22
-ENV ImageOS=${ImageOS}
+ENV ImageOS=ubuntu22


📝 It's because ubuntu20 will be supported by another Dockerfile

44smkn · 2023-09-26T01:29:55Z

Dockerfile

+# tini sends the signal to children
+ENV RUNNER_MANUALLY_TRAP_SIG=
+
+# disable the log by default, because it is too large
+ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=


📝 Overwrite the settings of official image
https://github.com/actions/runner/blob/1ff8ad78608472c6bd235f5de8f5a95bd390742a/images/Dockerfile#L33-L34

Extend official actions/runner image

67e1c18

int128 force-pushed the int128/extend-official branch from 40ae35f to 67e1c18 Compare September 24, 2023 04:43

int128 added 2 commits September 24, 2023 14:11

Align with official Dockerfile

a5a94ad

Fix Renovate

af6ecf7

int128 commented Sep 24, 2023

View reviewed changes

Update DOCKER_VERSION

8e82bff

int128 commented Sep 24, 2023

View reviewed changes

int128 marked this pull request as ready for review September 25, 2023 09:08

int128 requested a review from a team as a code owner September 25, 2023 09:08

int128 requested review from motobrew, aoi1 and 44smkn and removed request for motobrew September 25, 2023 09:08

44smkn approved these changes Sep 26, 2023

View reviewed changes

aoi1 approved these changes Sep 26, 2023

View reviewed changes

int128 merged commit 44cb882 into main Sep 26, 2023
9 checks passed

int128 deleted the int128/extend-official branch September 26, 2023 03:57

int128 mentioned this pull request Sep 26, 2023

Update README.md #128

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend official actions/runner image #123

Extend official actions/runner image #123

int128 commented Sep 23, 2023 •

edited

Loading

github-actions bot commented Sep 23, 2023

github-actions bot commented Sep 23, 2023

github-actions bot commented Sep 24, 2023

github-actions bot commented Sep 24, 2023

int128 Sep 24, 2023

int128 Sep 24, 2023

int128 Sep 24, 2023 •

edited

Loading

aoi1 Sep 26, 2023

int128 Sep 26, 2023

github-actions bot commented Sep 24, 2023

int128 Sep 24, 2023

int128 Sep 24, 2023

44smkn Sep 26, 2023

44smkn left a comment

44smkn Sep 26, 2023

44smkn Sep 26, 2023

44smkn Sep 26, 2023

		ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
		ARG DOCKER_VERSION=23.0.6

Extend official actions/runner image #123

Extend official actions/runner image #123

Conversation

int128 commented Sep 23, 2023 • edited Loading

Problem to solve

How to solve

Changes

github-actions bot commented Sep 23, 2023

github-actions bot commented Sep 23, 2023

github-actions bot commented Sep 24, 2023

github-actions bot commented Sep 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

int128 Sep 24, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Sep 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

44smkn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

int128 commented Sep 23, 2023 •

edited

Loading

int128 Sep 24, 2023 •

edited

Loading