mirror of
https://github.com/actions/actions-runner-controller.git
synced 2025-12-11 03:57:01 +00:00
feat: dind-rootless 22.04 runner (#2033)
* feat: dind-rootless 22.04 runner * runner: Bring back packages needed by rootlesskit * e2e: Update E2E buildvars with ubuntu 22.04 dockerfiles * feat: use new uid for runner user * e2e: Make it possible to inject ubuntu version via envvar for actiosn-runner-dind image * doc: Use fsGroup=1001 for IRSA on Ubuntu 22.04 runner Co-authored-by: toast-gear <toast-gear@users.noreply.github.com> Co-authored-by: Yusuke Kuoka <ykuoka@gmail.com>
This commit is contained in:
@@ -92,7 +92,10 @@ func TestE2E(t *testing.T) {
|
||||
skipTestIDCleanUp := os.Getenv("ARC_E2E_SKIP_TEST_ID_CLEANUP") != ""
|
||||
skipArgoTunnelCleanUp := os.Getenv("ARC_E2E_SKIP_ARGO_TUNNEL_CLEAN_UP") != ""
|
||||
|
||||
vars := buildVars(os.Getenv("ARC_E2E_IMAGE_REPO"))
|
||||
vars := buildVars(
|
||||
os.Getenv("ARC_E2E_IMAGE_REPO"),
|
||||
os.Getenv("UBUNTU_VERSION"),
|
||||
)
|
||||
|
||||
var testedVersions = []struct {
|
||||
label string
|
||||
@@ -401,7 +404,7 @@ type vars struct {
|
||||
commonScriptEnv []string
|
||||
}
|
||||
|
||||
func buildVars(repo string) vars {
|
||||
func buildVars(repo, ubuntuVer string) vars {
|
||||
if repo == "" {
|
||||
repo = "actionsrunnercontrollere2e"
|
||||
}
|
||||
@@ -443,7 +446,7 @@ func buildVars(repo string) vars {
|
||||
EnableBuildX: true,
|
||||
},
|
||||
{
|
||||
Dockerfile: "../../runner/actions-runner.dockerfile",
|
||||
Dockerfile: fmt.Sprintf("../../runner/actions-runner.ubuntu-%s.dockerfile", ubuntuVer),
|
||||
Args: []testing.BuildArg{
|
||||
{
|
||||
Name: "RUNNER_VERSION",
|
||||
@@ -454,7 +457,7 @@ func buildVars(repo string) vars {
|
||||
EnableBuildX: true,
|
||||
},
|
||||
{
|
||||
Dockerfile: "../../runner/actions-runner-dind.dockerfile",
|
||||
Dockerfile: fmt.Sprintf("../../runner/actions-runner-dind.ubuntu-%s.dockerfile", ubuntuVer),
|
||||
Args: []testing.BuildArg{
|
||||
{
|
||||
Name: "RUNNER_VERSION",
|
||||
@@ -465,7 +468,7 @@ func buildVars(repo string) vars {
|
||||
EnableBuildX: true,
|
||||
},
|
||||
{
|
||||
Dockerfile: "../../runner/actions-runner-dind-rootless.dockerfile",
|
||||
Dockerfile: fmt.Sprintf("../../runner/actions-runner-dind-rootless.ubuntu-%s.dockerfile", ubuntuVer),
|
||||
Args: []testing.BuildArg{
|
||||
{
|
||||
Name: "RUNNER_VERSION",
|
||||
|
||||
Reference in New Issue
Block a user