opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove varlink support from Podman

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-11-18 16:12:33 -05:00
parent ad2439264d
commit f62a356515
101 changed files with 26 additions and 17765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/build_rpm.sh
View File

@ -49,7 +49,6 @@ if [[ $pkg_manager == *dnf ]]; then
fi
PKGS+=(python3-devel \
python3-varlink \
)
fi

4
contrib/cirrus/lib.sh
View File

@ -71,8 +71,8 @@ SCRIPT_BASE=${SCRIPT_BASE:-./contrib/cirrus}
# Downloaded, but not installed packages.
PACKAGE_DOWNLOAD_DIR=/var/cache/download
# Log remote-client system test varlink output here
PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/varlink.log
# Log remote-client system test server output here
PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/server.log
# Defaults when not running under CI
export CI="${CI:-false}"

8
contrib/cirrus/runner.sh
View File

@ -176,14 +176,6 @@ function _run_altbuild() {
*Without*)
make build-no-cgo
;;
*varlink-API)
export SUGGESTION='remove API.md, then "make varlink_api_generate" and commit changes.'
make varlink_api_generate BUILDTAGS="varlink"
./hack/tree_status.sh
;;
*varlink-binaries)
make clean BUILDTAGS="varlink" binaries
;;
*RPM*)
make -f ./.copr/Makefile
rpmbuild --rebuild ./podman-*.src.rpm

1
contrib/dependencies.txt
View File

@ -24,7 +24,6 @@ python3-pip
python3-psutil
python3-pytoml
python3-pyyaml
python3-varlink
rsync
slirp4netns
unzip

1
contrib/spec/podman.spec.in
View File

@ -166,7 +166,6 @@ Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4
# "-" are not accepted in version strings, so comment out below line
#Provides: bundled(golang(github.com/urfave/cli)) = fix-short-opts-parsing
Provides: bundled(golang(github.com/varlink/go)) = master
Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2
Provides: bundled(golang(github.com/vishvananda/netlink)) = master
Provides: bundled(golang(github.com/vishvananda/netns)) = master

7
contrib/spec/python-podman.spec.in
View File

@ -36,20 +36,13 @@ BuildArch: noarch
BuildRequires: git
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-varlink
Requires: python3-humanize
Requires: python3-pytoml
Requires: python3-setuptools
Requires: python3-varlink
Requires: python3-psutil
Requires: podman
%if 0%{?fedora}
# 2018-07-20 RHEL8 doesn't have varlink RPM yet
Requires: python3-varlink
%endif
Provides: %{name} = %{version}-%{release}
%description

15
contrib/varlink/io.podman.service
View File

@ -1,15 +0,0 @@
[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:%t/podman/io.podman --timeout=60000
TimeoutStopSec=30
KillMode=process
[Install]
WantedBy=multi-user.target
Also=io.podman.socket

10
contrib/varlink/io.podman.socket
View File

@ -1,10 +0,0 @@
[Unit]
Description=Podman Remote API Socket
Documentation=man:podman-varlink(1)
[Socket]
ListenStream=%t/podman/io.podman
SocketMode=0600
[Install]
WantedBy=sockets.target