summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/python/podman/examples/run_example.sh4
-rw-r--r--contrib/python/podman/podman/client.py10
-rw-r--r--contrib/python/podman/podman/libs/errors.py8
-rw-r--r--contrib/python/podman/test/test_client.py4
-rwxr-xr-xcontrib/python/podman/test/test_runner.sh2
-rw-r--r--contrib/python/podman/test/test_tunnel.py2
-rw-r--r--contrib/python/pypodman/docs/man1/pypodman.14
-rw-r--r--contrib/python/pypodman/pypodman/lib/config.py4
-rw-r--r--contrib/varlink/io.podman.service13
-rw-r--r--contrib/varlink/io.podman.socket (renamed from contrib/varlink/io.projectatomic.podman.socket)2
-rw-r--r--contrib/varlink/io.projectatomic.podman.service13
11 files changed, 33 insertions, 33 deletions
diff --git a/contrib/python/podman/examples/run_example.sh b/contrib/python/podman/examples/run_example.sh
index 0f6575073..d81ddf456 100755
--- a/contrib/python/podman/examples/run_example.sh
+++ b/contrib/python/podman/examples/run_example.sh
@@ -22,8 +22,8 @@ if [[ $(id -u) != 0 ]]; then
exit 2
fi
-if ! systemctl --quiet is-active io.projectatomic.podman.socket; then
- echo 1>&2 'podman is not running. systemctl enable --now io.projectatomic.podman.socket'
+if ! systemctl --quiet is-active io.podman.socket; then
+ echo 1>&2 'podman is not running. systemctl enable --now io.podman.socket'
exit 1
fi
diff --git a/contrib/python/podman/podman/client.py b/contrib/python/podman/podman/client.py
index fedd9310e..327bfdee2 100644
--- a/contrib/python/podman/podman/client.py
+++ b/contrib/python/podman/podman/client.py
@@ -31,7 +31,7 @@ class BaseClient():
@classmethod
def factory(cls,
uri=None,
- interface='io.projectatomic.podman',
+ interface='io.podman',
*args,
**kwargs):
"""Construct a Client based on input."""
@@ -153,18 +153,18 @@ class Client():
>>> import podman
>>> c = podman.Client(uri='unix:/tmp/podman.sock',
- remote_uri='ssh://user@host/run/podman/io.projectatomic.podman',
+ remote_uri='ssh://user@host/run/podman/io.podman',
identity_file='~/.ssh/id_rsa')
"""
def __init__(self,
- uri='unix:/run/podman/io.projectatomic.podman',
- interface='io.projectatomic.podman',
+ uri='unix:/run/podman/io.podman',
+ interface='io.podman',
**kwargs):
"""Construct a podman varlink Client.
uri from default systemd unit file.
- interface from io.projectatomic.podman.varlink, do not change unless
+ interface from io.podman.varlink, do not change unless
you are a varlink guru.
"""
self._client = BaseClient.factory(uri, interface, **kwargs)
diff --git a/contrib/python/podman/podman/libs/errors.py b/contrib/python/podman/podman/libs/errors.py
index d34577a57..9d7559c84 100644
--- a/contrib/python/podman/podman/libs/errors.py
+++ b/contrib/python/podman/podman/libs/errors.py
@@ -50,10 +50,10 @@ class PodmanError(VarlinkErrorProxy):
ERROR_MAP = {
- 'io.projectatomic.podman.ContainerNotFound': ContainerNotFound,
- 'io.projectatomic.podman.ErrorOccurred': ErrorOccurred,
- 'io.projectatomic.podman.ImageNotFound': ImageNotFound,
- 'io.projectatomic.podman.RuntimeError': PodmanError,
+ 'io.podman.ContainerNotFound': ContainerNotFound,
+ 'io.podman.ErrorOccurred': ErrorOccurred,
+ 'io.podman.ImageNotFound': ImageNotFound,
+ 'io.podman.RuntimeError': PodmanError,
}
diff --git a/contrib/python/podman/test/test_client.py b/contrib/python/podman/test/test_client.py
index d36cb1a43..3fc6d39dc 100644
--- a/contrib/python/podman/test/test_client.py
+++ b/contrib/python/podman/test/test_client.py
@@ -15,7 +15,7 @@ class TestClient(unittest.TestCase):
def test_local(self, mock_ping):
p = Client(
uri='unix:/run/podman',
- interface='io.projectatomic.podman',
+ interface='io.podman',
)
self.assertIsInstance(p._client, LocalClient)
@@ -27,7 +27,7 @@ class TestClient(unittest.TestCase):
def test_remote(self, mock_ping):
p = Client(
uri='unix:/run/podman',
- interface='io.projectatomic.podman',
+ interface='io.podman',
remote_uri='ssh://user@hostname/run/podman/podman',
identity_file='~/.ssh/id_rsa')
diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh
index 17dd2a30c..a9142d36d 100755
--- a/contrib/python/podman/test/test_runner.sh
+++ b/contrib/python/podman/test/test_runner.sh
@@ -106,7 +106,7 @@ RUN chmod 755 /tmp/hello.sh
ENTRYPOINT ["/tmp/hello.sh"]
EOT
-export PODMAN_HOST="unix:${TMPDIR}/podman/io.projectatomic.podman"
+export PODMAN_HOST="unix:${TMPDIR}/podman/io.podman"
PODMAN_ARGS="--storage-driver=vfs \
--root=${TMPDIR}/crio \
--runroot=${TMPDIR}/crio-run \
diff --git a/contrib/python/podman/test/test_tunnel.py b/contrib/python/podman/test/test_tunnel.py
index cdcc8466a..8ee4b1052 100644
--- a/contrib/python/podman/test/test_tunnel.py
+++ b/contrib/python/podman/test/test_tunnel.py
@@ -56,7 +56,7 @@ class TestTunnel(unittest.TestCase):
context = Context(
'unix:/01',
- 'io.projectatomic.podman',
+ 'io.podman',
'/tmp/user/socket',
'/run/podman/socket',
'user',
diff --git a/contrib/python/pypodman/docs/man1/pypodman.1 b/contrib/python/pypodman/docs/man1/pypodman.1
index 7c4816062..09acb205b 100644
--- a/contrib/python/pypodman/docs/man1/pypodman.1
+++ b/contrib/python/pypodman/docs/man1/pypodman.1
@@ -54,7 +54,7 @@ Default is None and will allow \f[C]ssh\f[] to follow it's default configuration
\f[B]\[en]remote\-socket\-path\f[]
.PP
Path on remote host for podman service's \f[C]AF_UNIX\f[] socket. The default is
-\f[C]/run/podman/io.projectatomic.podman\f[].
+\f[C]/run/podman/io.podman\f[].
.PP
\f[B]\[en]identity\-file\f[]
.PP
@@ -92,7 +92,7 @@ From command line option, for example: \[en]run\-dir
This should provide Operators the ability to setup basic configurations
and allow users to customize them.
.PP
-\f[B]XDG_RUNTIME_DIR\f[] (\f[C]XDG_RUNTIME_DIR/io.projectatomic.podman\f[])
+\f[B]XDG_RUNTIME_DIR\f[] (\f[C]XDG_RUNTIME_DIR/io.podman\f[])
.PP
Directory where pypodman stores non\-essential runtime files and other file
objects (such as sockets, named pipes, \&...).
diff --git a/contrib/python/pypodman/pypodman/lib/config.py b/contrib/python/pypodman/pypodman/lib/config.py
index 137ffdb34..0d5004b9d 100644
--- a/contrib/python/pypodman/pypodman/lib/config.py
+++ b/contrib/python/pypodman/pypodman/lib/config.py
@@ -101,7 +101,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
'--remote-socket-path',
metavar='PATH',
help=('path of podman socket on remote host'
- ' (default: /run/podman/io.projectatomic.podman)'))
+ ' (default: /run/podman/io.podman)'))
self.add_argument(
'--identity-file',
'-i',
@@ -198,7 +198,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
getattr(args, 'remote_socket_path')
or os.environ.get('REMOTE_SOCKET_PATH')
or config['default'].get('remote_socket_path')
- or '/run/podman/io.projectatomic.podman'
+ or '/run/podman/io.podman'
) # yapf:disable
reqattr(
diff --git a/contrib/varlink/io.podman.service b/contrib/varlink/io.podman.service
new file mode 100644
index 000000000..c524ce815
--- /dev/null
+++ b/contrib/varlink/io.podman.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Podman Remote API Service
+Requires=io.podman.socket
+After=io.podman.socket
+Documentation=man:podman-varlink(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/podman varlink unix:/run/podman/io.podman
+
+[Install]
+WantedBy=multi-user.target
+Also=io.podman.socket
diff --git a/contrib/varlink/io.projectatomic.podman.socket b/contrib/varlink/io.podman.socket
index bd82c4240..0f09fe3ef 100644
--- a/contrib/varlink/io.projectatomic.podman.socket
+++ b/contrib/varlink/io.podman.socket
@@ -3,7 +3,7 @@ Description=Podman Remote API Socket
Documentation=man:podman-varlink(1)
[Socket]
-ListenStream=/run/podman/io.projectatomic.podman
+ListenStream=/run/podman/io.podman
SocketMode=0600
[Install]
diff --git a/contrib/varlink/io.projectatomic.podman.service b/contrib/varlink/io.projectatomic.podman.service
deleted file mode 100644
index 1c4c1435f..000000000
--- a/contrib/varlink/io.projectatomic.podman.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Podman Remote API Service
-Requires=io.projectatomic.podman.socket
-After=io.projectatomic.podman.socket
-Documentation=man:podman-varlink(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/podman varlink unix:/run/podman/io.projectatomic.podman
-
-[Install]
-WantedBy=multi-user.target
-Also=io.projectatomic.podman.socket
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 23:18:51 +0000