Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

app-emulation/containerd: make containerd listen on localhost #41

Merged
merged 1 commit into from Jun 28, 2019
Merged

app-emulation/containerd: make containerd listen on localhost #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ...ion/containerd/containerd-1.1.2-r2.ebuild → ...ion/containerd/containerd-1.1.2-r3.ebuild
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions app-emulation/containerd/files/config.toml
View file
Open in desktop
Expand Up @@ -29,4 +29,6 @@ no_shim = false
shim_debug = true

[plugins.cri]
stream_server_address = "127.0.0.1"
stream_server_port = "10010"
systemd_cgroup = true
2 changes: 1 addition & 1 deletion app-emulation/docker/docker-9999.ebuild
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ RDEPEND="
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
dev-libs/libltdl
~app-emulation/containerd-1.1.2-r2
~app-emulation/containerd-1.1.2-r3
~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?]
~app-emulation/docker-proxy-0.8.0_p20180709
container-init? ( >=sys-process/tini-0.13.1 )
Expand Down
2 changes: 1 addition & 1 deletion app-torcx/docker/docker-18.06.ebuild
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image.
RDEPEND="
~app-emulation/docker-18.06.3-r3
~app-emulation/containerd-1.1.2-r2
~app-emulation/containerd-1.1.2-r3
~app-emulation/docker-proxy-0.8.0_p20180709
~app-emulation/docker-runc-1.0.0_rc5_p22
=dev-libs/libltdl-2.4.6
Expand Down
0 ...5-cache/app-emulation/containerd-1.1.2-r2 → ...5-cache/app-emulation/containerd-1.1.2-r3
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions metadata/md5-cache/app-emulation/docker-18.06.1-r3
View file
Open in desktop
Expand Up @@ -6,11 +6,7 @@ HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 kernel_linux
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
<<<<<<< HEAD:metadata/md5-cache/app-emulation/docker-18.06.1-r3
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.1.2-r2 =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
=======
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 ~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
>>>>>>> flatcar-master:metadata/md5-cache/app-emulation/docker-18.06.3
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.1.2-r3 =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
REQUIRED_USE=go_version_go1_10
RESTRICT=installsources strip
SLOT=0
Expand Down
6 changes: 1 addition & 5 deletions metadata/md5-cache/app-emulation/docker-18.06.3
View file
Open in desktop
Expand Up @@ -6,11 +6,7 @@ HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 kernel_linux
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
<<<<<<< HEAD:metadata/md5-cache/app-emulation/docker-18.06.1-r3
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.1.2-r2 =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
=======
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2 ~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
>>>>>>> flatcar-master:metadata/md5-cache/app-emulation/docker-18.06.3
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl =app-emulation/containerd-1.1.2-r3 =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
REQUIRED_USE=go_version_go1_10
RESTRICT=installsources strip
SLOT=0
Expand Down
2 changes: 1 addition & 1 deletion metadata/md5-cache/app-emulation/docker-9999
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp +journald +selinux +go_version_go1_10 kernel_linux
KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2-r2 ~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.1.2-r3 ~app-emulation/docker-runc-1.0.0_rc5_p22[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 )
REQUIRED_USE=go_version_go1_10
RESTRICT=installsources strip
SLOT=0
Expand Down
2 changes: 1 addition & 1 deletion metadata/md5-cache/app-torcx/docker-18.06
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@ DESCRIPTION=Packages to be installed in a torcx image for Docker
EAPI=2
KEYWORDS=amd64 arm64
LICENSE=GPL-2
RDEPEND=~app-emulation/docker-18.06.1-r3 ~app-emulation/containerd-1.1.2-r2 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
RDEPEND=~app-emulation/docker-18.06.1-r3 ~app-emulation/containerd-1.1.2-r3 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc5_p22 =dev-libs/libltdl-2.4.6 =sys-process/tini-0.13.2
SLOT=0
_md5_=3db2176202d29e476a0eac4c9c2b0d55