Skip to content
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

feat: Add userns patch in finch daemon to support idmapping #75

Closed
wants to merge 1 commit into from
Closed

feat: Add userns patch in finch daemon to support idmapping #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ unit-test-coverage-report.html
*.test
build
THIRD_PARTY_LICENSES
tmp
27 changes: 25 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,40 @@ ifndef GODEBUG
EXTRA_LDFLAGS += -s -w
endif

.PHONY: build
build:
NERDCTL_REPO = https://github.com/containerd/nerdctl.git
NERDCTL_TAG = v1.7.7
NERDCTL_PATCH = patches/userns.patch

.PHONY: patch-nerdctl build clean restore-mod
build: patch-nerdctl
$(eval PACKAGE := github.com/runfinch/finch-daemon)
$(eval VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.modified' --always --tags))
$(eval GITCOMMIT := $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi))
$(eval LDFLAGS := "-X $(PACKAGE)/version.Version=$(VERSION) -X $(PACKAGE)/version.GitCommit=$(GITCOMMIT) $(EXTRA_LDFLAGS)")
go mod edit -replace=github.com/containerd/[email protected]=./tmp/nerdctl && go mod tidy
GOOS=linux go build -ldflags $(LDFLAGS) -v -o $(BINARY) $(PACKAGE)/cmd/finch-daemon
$(MAKE) restore-mod

patch-nerdctl:
rm -rf tmp && mkdir -p tmp

cp go.mod tmp/go.mod.bak
cp go.sum tmp/go.sum.bak

cd tmp && git clone $(NERDCTL_REPO)
cd tmp/nerdctl && git fetch --tags
cd tmp/nerdctl && git checkout tags/$(NERDCTL_TAG) -b $(NERDCTL_TAG)-branch
cd tmp/nerdctl && git apply ../../$(NERDCTL_PATCH)

restore-mod:
# Restore the original go.mod and go.sum files
mv tmp/go.mod.bak go.mod
mv tmp/go.sum.bak go.sum

clean:
@rm -f $(BINARIES)
@rm -rf $(BIN)
@rm -rf tmp

.PHONY: linux
linux:
Expand Down
Loading
Loading