Skip to content

Commit

Permalink
Merge pull request #459 from AkihiroSuda/dev
Browse files Browse the repository at this point in the history
Deprecate rootlesskit-docker-proxy (no longer needed since Docker v28)
  • Loading branch information
AkihiroSuda authored Aug 17, 2024
2 parents b5b8e22 + 8751f26 commit 7f0c4ee
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ bin/rootlessctl: $(GO_FILES)
$(GO) build -o $@ -v ./cmd/rootlessctl

bin/rootlesskit-docker-proxy: $(GO_FILES)
@echo "NOTE: rootlesskit-docker-proxy is required only if you use Docker prior to v28."
@echo "NOTE: rootlesskit-docker-proxy is DEPRECATED and will be removed in RootlessKit v3."
$(GO) build -o $@ -v ./cmd/rootlesskit-docker-proxy

.PHONY: cross
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Run `make && sudo make install` .
The following binaries will be installed:
- `/usr/local/bin/rootlesskit`
- `/usr/local/bin/rootlessctl`
- `/usr/local/bin/rootlesskit-docker-proxy` (Can be safely removed if you do not use Docker)
- `/usr/local/bin/rootlesskit-docker-proxy` (DEPRECATED; Only required for Docker prior to [v28](https://github.com/moby/moby/pull/48132/commits/dac7ffa3404138a4f291c16586e5a2c68dad4151))

### Requirements

Expand Down
9 changes: 9 additions & 0 deletions cmd/rootlesskit-docker-proxy/main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
// Package main provides the `rootlesskit-docker-proxy` binary (DEPRECATED)
// that was used by Docker prior to v28 for supporting rootless mode.
//
// The rootlesskit-docker-proxy binary is no longer needed since Docker v28,
// as the functionality of rootlesskit-docker-proxy is now provided by dockerd itself.
//
// https://github.com/moby/moby/pull/48132/commits/dac7ffa3404138a4f291c16586e5a2c68dad4151
//
// rootlesskit-docker-proxy will be removed in RootlessKit v3.
package main

import (
Expand Down

0 comments on commit 7f0c4ee

Please sign in to comment.