From 98ed4ba73866e9ed191b56948537af8ec8f67bb8 Mon Sep 17 00:00:00 2001 From: nixpig <143995476+nixpig@users.noreply.github.com> Date: Sun, 15 Dec 2024 08:58:12 +0000 Subject: [PATCH] test: re-enable docker int --- .github/workflows/build.yml | 6 +++--- container/container_reexec.go | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab64e77..32797c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: sudo systemctl restart docker # for some reason this hangs in CI; need to investigate - # - name: run docker hello-world - # run: | - # ./test/docker-integration.sh + - name: run docker hello-world + run: | + sudo ./test/docker-integration.sh diff --git a/container/container_reexec.go b/container/container_reexec.go index b731a92..ab682f4 100644 --- a/container/container_reexec.go +++ b/container/container_reexec.go @@ -148,6 +148,7 @@ func (c *Container) Reexec() error { return fmt.Errorf("set additional GIDs: %w", err) } + // TODO: reimplement uid and gid mappings for execve // if c.Spec.Linux.UIDMappings != nil { // cmd.SysProcAttr.UidMappings = // user.BuildUIDMappings(c.Spec.Linux.UIDMappings)