Skip to content

Commit

Permalink
chore: fix some typos in comments (#4020)
Browse files Browse the repository at this point in the history
Signed-off-by: yudrywet <[email protected]>
  • Loading branch information
yudrywet authored Apr 14, 2024
1 parent 87c6587 commit 3810eef
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion buildcontext/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
2 changes: 1 addition & 1 deletion builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
)

Expand Down
2 changes: 1 addition & 1 deletion buildkitd/oom-adjust.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;;
Expand Down
2 changes: 1 addition & 1 deletion conslogging/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion examples/mkdocs/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion util/containerutil/podman.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion util/containerutil/shell_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 3810eef

Please sign in to comment.