From 3810eef5d095682d4de2691b39390441e7a9e4a4 Mon Sep 17 00:00:00 2001 From: yudrywet <166895665+yudrywet@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:15:32 +0800 Subject: [PATCH] chore: fix some typos in comments (#4020) Signed-off-by: yudrywet --- buildcontext/git.go | 2 +- builder/builder.go | 2 +- buildkitd/oom-adjust.sh.template | 2 +- conslogging/bundle.go | 2 +- examples/mkdocs/README.md | 2 +- util/containerutil/podman.go | 2 +- util/containerutil/shell_shared.go | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildcontext/git.go b/buildcontext/git.go index df61944f..02cd8fc1 100644 --- a/buildcontext/git.go +++ b/buildcontext/git.go @@ -242,7 +242,7 @@ func (gr *gitResolver) resolveGitProject(ctx context.Context, gwClient gwclient. gitOpts = append(gitOpts, llb.KnownSSHHosts(strings.Join(keyScans, "\n"))) } if gr.lfsInclude != "" { - // TODO this should eventually be infered by the contents of a COPY command, which means the call to resolveGitProject will need to be lazy-evaluated + // TODO this should eventually be inferred by the contents of a COPY command, which means the call to resolveGitProject will need to be lazy-evaluated // However this makes it really difficult for an Earthfile which first has an ARG EARTHLY_GIT_HASH, then a RUN, then a COPY gitOpts = append(gitOpts, llb.LFSInclude(gr.lfsInclude)) } diff --git a/builder/builder.go b/builder/builder.go index 427ae418..69c89699 100644 --- a/builder/builder.go +++ b/builder/builder.go @@ -247,7 +247,7 @@ func (b *Builder) convertAndBuild(ctx context.Context, target domain.Target, opt exportCoordinator = gatewaycrafter.NewExportCoordinator() // dirIDs maps a dirIndex to a dirID; the "dir-id" field was introduced - // to accomodate parallelism in the WAIT/END PopWaitBlock handling + // to accommodate parallelism in the WAIT/END PopWaitBlock handling dirIDs = map[int]string{} ) diff --git a/buildkitd/oom-adjust.sh.template b/buildkitd/oom-adjust.sh.template index 26f894dc..860bd3de 100644 --- a/buildkitd/oom-adjust.sh.template +++ b/buildkitd/oom-adjust.sh.template @@ -23,7 +23,7 @@ do PID_NAME=$(cat /proc/"$PID"/cmdline || echo "unknown") case "$PID_NAME" in - # This is the POSIX way to do a string-starts-with, and accomodates the one prefix we do not want. Order here is important. + # This is the POSIX way to do a string-starts-with, and accommodates the one prefix we do not want. Order here is important. "buildkit-runcinit"*) log "$PID was buildkit-runcinit, ignoring"; continue ;; "buildkit-runc"*) log "$PID is runc parent($PID_NAME), proceeding" ;; *) log "$PID was $PID_NAME, ignoring"; continue ;; diff --git a/conslogging/bundle.go b/conslogging/bundle.go index 078ae215..520bce4a 100644 --- a/conslogging/bundle.go +++ b/conslogging/bundle.go @@ -72,7 +72,7 @@ func (bb *BundleBuilder) PrefixStatus(prefix, status string) { } // PrefixWriter gets an io.Writer for a given prefix(aka target). If its a prefix we have not seen before, -// then generate a new writer to accomodate it. +// then generate a new writer to accommodate it. func (bb *BundleBuilder) PrefixWriter(prefix string) io.Writer { bb.mu.Lock() defer bb.mu.Unlock() diff --git a/examples/mkdocs/README.md b/examples/mkdocs/README.md index 6ef5adc7..f1a13b6a 100644 --- a/examples/mkdocs/README.md +++ b/examples/mkdocs/README.md @@ -1,6 +1,6 @@ # Material for MkDocs -This example shows demonstrates [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) using Earthly, and includes a live reloading development enviorment with `mkdocs serve`. +This example shows demonstrates [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/) using Earthly, and includes a live reloading development environment with `mkdocs serve`. ## Usage diff --git a/util/containerutil/podman.go b/util/containerutil/podman.go index cd8e41f5..28b814a2 100644 --- a/util/containerutil/podman.go +++ b/util/containerutil/podman.go @@ -166,7 +166,7 @@ func (psf *podmanShellFrontend) ImageLoadFromFileCommand(filename string) string func (psf *podmanShellFrontend) ImageLoad(ctx context.Context, images ...io.Reader) error { var err error for _, image := range images { - // Write the image to a temp file. This is needed to accomodate some Podman versions between 3.0 and 3.4. Because + // Write the image to a temp file. This is needed to accommodate some Podman versions between 3.0 and 3.4. Because // buildkit creates weird hybrid docker/OCI images, Podman pulls it in as an OCI image and ends up neglecting the // in-built image tag. We can get around this by "pulling" a tar file and specifying the format at the CLI. This // is more or less what Podman will be doing going forward. For further context, see the linked issues and discussion diff --git a/util/containerutil/shell_shared.go b/util/containerutil/shell_shared.go index 84527382..1ca9dab1 100644 --- a/util/containerutil/shell_shared.go +++ b/util/containerutil/shell_shared.go @@ -439,6 +439,6 @@ func IsLocal(addr string) bool { return hostname == "127.0.0.1" || // The only IP v4 Loopback we honor. Because we need to include it in the TLS certificates. hostname == net.IPv6loopback.String() || hostname == "localhost" || // Convention. Users hostname omitted; this is only really here for convenience. - parsed.Scheme == "docker-container" || // Accomodate feature flagging during transition. This will have omitted TLS? + parsed.Scheme == "docker-container" || // Accommodate feature flagging during transition. This will have omitted TLS? parsed.Scheme == "podman-container" }