summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--cmd/podman/commit.go9
-rw-r--r--contrib/systemd/README.md12
-rw-r--r--docs/source/markdown/podman-commit.1.md2
-rw-r--r--docs/source/markdown/podman-login.1.md2
-rw-r--r--docs/source/markdown/podman-pod-ps.1.md2
-rw-r--r--docs/source/markdown/podman-system-df.1.md2
-rw-r--r--docs/source/markdown/podman.1.md2
-rw-r--r--install.md4
-rw-r--r--pkg/api/Makefile1
-rw-r--r--pkg/api/handlers/types.go4
-rw-r--r--pkg/bindings/test/common_test.go6
-rw-r--r--pkg/rootless/rootless_linux.c3
13 files changed, 31 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index f90124435..f71f7d2b1 100644
--- a/Makefile
+++ b/Makefile
@@ -591,7 +591,7 @@ validate.completions: completions/bash/podman
if [ -x /bin/zsh ]; then /bin/zsh completions/zsh/_podman; fi
.PHONY: validate
-validate: gofmt .gitvalidation validate.completions golangci-lint man-page-check
+validate: lint gofmt .gitvalidation validate.completions man-page-check
.PHONY: build-all-new-commits
build-all-new-commits:
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index e98b71514..604e8d31c 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -56,12 +56,15 @@ func commitCmd(c *cliconfig.CommitValues) error {
defer runtime.DeferredShutdown(false)
args := c.InputArgs
- if len(args) != 2 {
- return errors.Errorf("you must provide a container name or ID and a target image name")
+ if len(args) < 1 {
+ return errors.Errorf("you must provide a container name or ID and optionally a target image name")
}
container := args[0]
- reference := args[1]
+ reference := ""
+ if len(args) > 1 {
+ reference = args[1]
+ }
if c.Flag("change").Changed {
for _, change := range c.Change {
splitChange := strings.Split(strings.ToUpper(change), "=")
diff --git a/contrib/systemd/README.md b/contrib/systemd/README.md
index 20f11467a..ff266c6a5 100644
--- a/contrib/systemd/README.md
+++ b/contrib/systemd/README.md
@@ -5,15 +5,15 @@
The following unit file examples assume:
1. copied the `service` executable into `/usr/local/bin`
1. `chcon system_u:object_r:container_runtime_exec_t:s0 /usr/local/bin/service`
-
+
then:
1. copy the `podman.service` and `podman.socket` files into `/etc/systemd/system`
1. `systemctl daemon-reload`
1. `systemctl enable podman.socket`
1. `systemctl start podman.socket`
1. `systemctl status podman.socket podman.service`
-
-Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock`
+
+Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/podman/podman.sock`
### podman.service
```toml
@@ -55,15 +55,15 @@ The following unit file examples assume:
1. you have a created a directory `~/bin`
1. copied the `service` executable into `~/bin`
1. `chcon system_u:object_r:container_runtime_exec_t:s0 ~/bin/service`
-
+
then:
1. `mkdir -p ~/.config/systemd/user`
1. copy the `podman.service` and `podman.socket` files into `~/.config/systemd/user`
1. `systemctl --user enable podman.socket`
1. `systemctl --user start podman.socket`
1. `systemctl --user status podman.socket podman.service`
-
-Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock`
+
+Assuming the status messages show no errors, the libpod service is ready to respond to the APIv2 on the unix domain socket `/run/user/$(id -u)/podman/podman.sock`
### podman.service
diff --git a/docs/source/markdown/podman-commit.1.md b/docs/source/markdown/podman-commit.1.md
index 07a885ae2..042ec7934 100644
--- a/docs/source/markdown/podman-commit.1.md
+++ b/docs/source/markdown/podman-commit.1.md
@@ -6,7 +6,7 @@ podman\-commit - Create new image based on the changed container
## SYNOPSIS
**podman commit** [*options*] *container* *image*
-**podman container commit** [*options*] *container* *image*
+**podman container commit** [*options*] *container* [*image*]
## DESCRIPTION
**podman commit** creates an image based on a changed container. The author of the
diff --git a/docs/source/markdown/podman-login.1.md b/docs/source/markdown/podman-login.1.md
index 9d368e9f2..8a84d359d 100644
--- a/docs/source/markdown/podman-login.1.md
+++ b/docs/source/markdown/podman-login.1.md
@@ -29,7 +29,7 @@ Password for registry
Take the password from stdin
-**--username**, **-u=***username*
+**--username**, **-u**=*username*
Username for registry
diff --git a/docs/source/markdown/podman-pod-ps.1.md b/docs/source/markdown/podman-pod-ps.1.md
index 65a7072ab..887682f19 100644
--- a/docs/source/markdown/podman-pod-ps.1.md
+++ b/docs/source/markdown/podman-pod-ps.1.md
@@ -75,7 +75,7 @@ Sort by created, ID, name, status, or number of containers
Default: created
-**--filter**, **-f=***filter*
+**--filter**, **-f**=*filter*
Filter output based on conditions given
diff --git a/docs/source/markdown/podman-system-df.1.md b/docs/source/markdown/podman-system-df.1.md
index 3ddb685fc..57c02b8e1 100644
--- a/docs/source/markdown/podman-system-df.1.md
+++ b/docs/source/markdown/podman-system-df.1.md
@@ -10,7 +10,7 @@ podman\-system\-df - Show podman disk usage
Show podman disk usage
## OPTIONS
-**--format=***format*
+**--format**=*format*
Pretty-print images using a Go template
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index fc069a7b0..af0e55925 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -79,7 +79,7 @@ When namespace is set, created containers and pods will join the given namespace
**--network-cmd-path**=*path*
Path to the command binary to use for setting up a network. It is currently only used for setting up a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable.
-**--root=***value*
+**--root**=*value*
Storage root dir in which data, including images, is stored (default: "/var/lib/containers/storage" for UID 0, "$HOME/.local/share/containers/storage" for other users).
Default root dir is configured in `/etc/containers/storage.conf`.
diff --git a/install.md b/install.md
index cd77ad139..b143c7f7a 100644
--- a/install.md
+++ b/install.md
@@ -90,7 +90,7 @@ Built-in, no need to install
#### [Raspbian](https://raspbian.org)
The Kubic project provides packages for Raspbian 10.
-
+
```bash
# Raspbian 10
echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Raspbian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
@@ -184,7 +184,7 @@ with our [COPR repository](https://copr.fedorainfracloud.org/coprs/baude/Upstrea
#### [Raspbian](https://raspbian.org)
The Kubic project provides RC/testing packages for Raspbian 10.
-
+
```bash
# Raspbian 10
echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/Raspbian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list
diff --git a/pkg/api/Makefile b/pkg/api/Makefile
index f564b6516..c68e50011 100644
--- a/pkg/api/Makefile
+++ b/pkg/api/Makefile
@@ -10,4 +10,3 @@ ${SWAGGER_OUT}:
# generate doesn't remove file on error
rm -f ${SWAGGER_OUT}
swagger generate spec -o ${SWAGGER_OUT} -i tags.yaml -w ./
-
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index 33cf1e95d..9c8562744 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -360,7 +360,7 @@ func LibpodToContainer(l *libpod.Container, infoData []define.InfoData) (*Contai
return &Container{docker.Container{
ID: l.ID(),
- Names: []string{l.Name()},
+ Names: []string{fmt.Sprintf("/%s", l.Name())},
Image: imageName,
ImageID: imageId,
Command: strings.Join(l.Command(), " "),
@@ -431,7 +431,7 @@ func LibpodToContainerJSON(l *libpod.Container) (*docker.ContainerJSON, error) {
HostsPath: inspect.HostsPath,
LogPath: l.LogPath(),
Node: nil,
- Name: l.Name(),
+ Name: fmt.Sprintf("/%s", l.Name()),
RestartCount: 0,
Driver: inspect.Driver,
Platform: "linux",
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index e3e66c89f..15783041f 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -62,6 +62,12 @@ func (b *bindingTest) runPodman(command []string) *gexec.Session {
} else {
cmd = append(cmd, "--runroot", b.runRoot)
}
+ val, ok = os.LookupEnv("TEMPDIR")
+ if ok {
+ cmd = append(cmd, "--tmpdir", val)
+ } else {
+ cmd = append(cmd, "--tmpdir", b.tempDirPath)
+ }
val, ok = os.LookupEnv("STORAGE_DRIVER")
if ok {
cmd = append(cmd, "--storage-driver", val)
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
index 041a161dc..83f4f3254 100644
--- a/pkg/rootless/rootless_linux.c
+++ b/pkg/rootless/rootless_linux.c
@@ -200,6 +200,9 @@ can_use_shortcut ()
if (argv == NULL)
return false;
+ if (strstr (argv[0], "podman") == NULL)
+ return false;
+
for (argc = 0; argv[argc]; argc++)
{
if (argc == 0 || argv[argc][0] == '-')
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-10 19:19:44 +0000