Skip to content

fix: allow envbuilder on sysbox container runtime #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix: allow envbuilder on sysbox container runtime #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fafa949
fix: allow envbuilder on sysbox container runtime
janLo Aug 16, 2023
39b4222
formatting
coadler Aug 21, 2023
3ee8a9e
fixup! formatting
coadler Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 83 additions & 6 deletions envbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,13 @@ import (
"syscall"
"time"

dcontext "github.com/distribution/distribution/v3/context"
"github.com/kballard/go-shellquote"
"github.com/mattn/go-isatty"

"github.com/GoogleContainerTools/kaniko/pkg/config"
"github.com/GoogleContainerTools/kaniko/pkg/creds"
"github.com/GoogleContainerTools/kaniko/pkg/executor"
"github.com/GoogleContainerTools/kaniko/pkg/util"
"github.com/coder/coder/codersdk"
"github.com/coder/envbuilder/devcontainer"
"github.com/containerd/containerd/platforms"
"github.com/distribution/distribution/v3/configuration"
dcontext "github.com/distribution/distribution/v3/context"
"github.com/distribution/distribution/v3/registry/handlers"
_ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem"
"github.com/docker/cli/cli/config/configfile"
Expand All @@ -44,9 +39,15 @@ import (
githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/kballard/go-shellquote"
"github.com/mattn/go-isatty"
"github.com/prometheus/procfs"
"github.com/sirupsen/logrus"
"github.com/tailscale/hujson"
"golang.org/x/xerrors"

"github.com/coder/coder/codersdk"
"github.com/coder/envbuilder/devcontainer"
)

const (
Expand Down Expand Up @@ -516,6 +517,61 @@ func Run(ctx context.Context, options Options) error {
})
}

// temp move of all ro mounts
tempRemounts := map[string]string{}

mountInfos, err := procfs.GetMounts()
if err != nil {
logf(codersdk.LogLevelError, "Failed to read mountinfo: %s", err)
}

prefixes := []string{filepath.Join("/", MagicDir), "/proc", "/sys"}
for _, mountInfo := range mountInfos {
logf(codersdk.LogLevelTrace, "Found mountpoint %s", mountInfo.MountPoint)
if _, ok := mountInfo.Options["ro"]; !ok {
continue
}
logf(codersdk.LogLevelTrace, "Found ro mountpoint %s ", mountInfo.MountPoint)

relevantMountpoint := true
for _, prefix := range prefixes {
if strings.HasPrefix(mountInfo.MountPoint, prefix) {
logf(codersdk.LogLevelTrace, "Mountpoint %s is NOT relevant (prefix: %s)", mountInfo.MountPoint, prefix)
relevantMountpoint = false
break
}
}
if !relevantMountpoint {
continue
}

src := mountInfo.MountPoint
tgt := filepath.Join("/", MagicDir, mountInfo.MountPoint)

logf(codersdk.LogLevelTrace, "Mountpoint %s is relevant", src)

logf(codersdk.LogLevelTrace, "Remount mountpoint %s to %s", src, tgt)

err := os.MkdirAll(tgt, 0750)
if err != nil {
logf(codersdk.LogLevelError, "Could not create temp mountpoint %s for %s: %s", tgt, src, err.Error())
continue
}

err = syscall.Mount(src, tgt, "bind", syscall.MS_BIND, "")
if err != nil {
logf(codersdk.LogLevelError, "Could not bindmount %s to %s: %s", src, tgt, err.Error())
continue
}
err = syscall.Unmount(src, 0)
if err != nil {
logf(codersdk.LogLevelError, "Could not unmount %s: %s", src, err.Error())
continue
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really want to continue in both of these cases? Wouldn't it be safer to error out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at it now I think you might be right. On the other hand, the error will catch you later anyway when kaniko tries to delete the containing directory to make room for the base image.

But I do think fail fast is better. Feel free to make any changes you feel suitable.

}

tempRemounts[src] = tgt
}

build := func() (v1.Image, error) {
_, err := options.Filesystem.Stat(MagicFile)
if err == nil && options.SkipRebuild {
Expand Down Expand Up @@ -652,6 +708,27 @@ func Run(ctx context.Context, options Options) error {
closeAfterBuild()
}

for src, tgt := range tempRemounts {
logf(codersdk.LogLevelTrace, "Cleanup mountpoint %s", tgt)
err := os.MkdirAll(src, 0750)
if err != nil {
logf(codersdk.LogLevelError, "Could not create mountpoint %s for %s: %w", src, tgt, err.Error())
continue
}

err = syscall.Mount(tgt, src, "bind", syscall.MS_BIND, "")
if err != nil {
logf(codersdk.LogLevelError, "Could not bindmount %s to %s: %s", tgt, src, err.Error())
continue
}

err = syscall.Unmount(tgt, 0)
if err != nil {
logf(codersdk.LogLevelError, "Could not unmount %s: %s", tgt, err.Error())
continue
}
}

// Create the magic file to indicate that this build
// has already been ran before!
file, err := options.Filesystem.Create(MagicFile)
Expand Down