Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions contrib/python/podman/examples/run_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.containers.podman.socket; then
echo 1>&2 'podman is not running. systemctl enable --now io.containers.podman.socket'
exit 1
fi

Expand Down
10 changes: 5 additions & 5 deletions contrib/python/podman/podman/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __call__(self):
@classmethod
def factory(cls,
uri=None,
interface='io.projectatomic.podman',
interface='io.containers.podman',
*args,
**kwargs):
"""Construct a Client based on input."""
Expand Down Expand Up @@ -150,18 +150,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.containers.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.containers.podman',
interface='io.containers.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.containers.podman.varlink, do not change unless
you are a varlink guru.
"""
self._client = BaseClient.factory(uri, interface, **kwargs)
Expand Down
8 changes: 4 additions & 4 deletions contrib/python/podman/podman/libs/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.containers.podman.ContainerNotFound': ContainerNotFound,
'io.containers.podman.ErrorOccurred': ErrorOccurred,
'io.containers.podman.ImageNotFound': ImageNotFound,
'io.containers.podman.RuntimeError': PodmanError,
}


Expand Down
4 changes: 2 additions & 2 deletions contrib/python/podman/test/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def setUp(self):
def test_local(self, mock_ping):
p = Client(
uri='unix:/run/podman',
interface='io.projectatomic.podman',
interface='io.containers.podman',
)

self.assertIsInstance(p._client, LocalClient)
Expand All @@ -27,7 +27,7 @@ def test_local(self, mock_ping):
def test_remote(self, mock_ping):
p = Client(
uri='unix:/run/podman',
interface='io.projectatomic.podman',
interface='io.containers.podman',
remote_uri='ssh://user@hostname/run/podmain/podman',
identity_file='~/.ssh/id_rsa')

Expand Down
2 changes: 1 addition & 1 deletion contrib/python/podman/test/test_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.containers.podman"
PODMAN_ARGS="--storage-driver=vfs \
--root=${TMPDIR}/crio \
--runroot=${TMPDIR}/crio-run \
Expand Down
2 changes: 1 addition & 1 deletion contrib/python/podman/test/test_tunnel.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_portal_no_reaping(self):
def test_tunnel(self, mock_finalize, mock_exists, mock_Popen):
context = Context(
'unix:/01',
'io.projectatomic.podman',
'io.containers.podman',
'/tmp/user/socket',
'/run/podman/socket',
'user',
Expand Down
4 changes: 2 additions & 2 deletions contrib/python/pypodman/docs/man1/pypodman.1
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ attempts to connect to \f[C]\-\-remote\-socket\-path\f[] on local host.
\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.containers.podman\f[].
.PP
\f[B]\[en]identity\-file\f[]
.PP
Expand Down Expand Up @@ -87,7 +87,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.containers.podman\f[])
.PP
Directory where pypodman stores non\-essential runtime files and other file
objects (such as sockets, named pipes, \&...).
Expand Down
4 changes: 2 additions & 2 deletions contrib/python/pypodman/pypodman/lib/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def initialize_parser(self):
'--remote-socket-path',
metavar='PATH',
help=('path of podman socket on remote host'
' (default: /run/podman/io.projectatomic.podman)'))
' (default: /run/podman/io.containers.podman)'))
self.add_argument(
'--identity-file',
metavar='PATH',
Expand Down Expand Up @@ -165,7 +165,7 @@ def reqattr(name, value):
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.containers.podman'
) # yapf:disable

reqattr(
Expand Down