Skip to content

Makefile fixes and other spring cleanup#3213

Merged
AkihiroSuda merged 2 commits intocontainerd:mainfrom
apostasie:dev-chores
Jul 16, 2024
Merged

Makefile fixes and other spring cleanup#3213
AkihiroSuda merged 2 commits intocontainerd:mainfrom
apostasie:dev-chores

Conversation

@apostasie
Copy link
Copy Markdown
Contributor

First commit removes DOCKER_BUILDKIT references, which have been the default for a while now.

Second commit focuses on the Makefile:

  • most importantly, make it possible to run make targets outside of source tree - clarifying and fixing use of CURDIR vs. newly introduced MAKEFILE_DIR
  • introducing lint tasks (golint & yamllint) - and also introducing the use of shellcheck
  • remove references to GO111MODULE which are no longer useful in 2024
  • some minor maintenance (variable-ize calls to docker, etc)

Comment thread Makefile
$(GO_BUILD) $(GO_BUILD_FLAGS) $(VERBOSE_FLAG) -o $(CURDIR)/_output/nerdctl$(BIN_EXT) ./cmd/nerdctl

clean:
find . -name \*~ -delete
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I am not sure what or why these two are for and if we do need these.
Is that to cleanup leftover files from vi?

Let me know if this should be moved to find $(MAKEFILE_DIR).

Comment thread cmd/nerdctl/builder_build_test.go Outdated
@apostasie
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda comment addressed (base check removed) - CI is green

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 80bfa8e into containerd:main Jul 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants