diff options
| author | Doan Luu Duc Tai <doan@luuduct.ai> | 2026-10-30 16:09:38 -0500 |
|---|---|---|
| committer | Doan Luu Duc Tai <doan@luuduct.ai> | 2026-10-30 16:09:38 -0500 |
| commit | 714866be200b882be437375006180456284bab1c (patch) | |
| tree | de9a7a6ef4a53991a6406a4546bebfe9bb7cb4f5 | |
| parent | c06e29dae4bb290fd2849f69da1bfa940c5a8222 (diff) | |
Use portable rootless networking and publish IPv6 ports
| -rw-r--r-- | infra/host-retire-docker.sh | 31 | ||||
| -rw-r--r-- | infra/podman.conf | 17 | ||||
| -rw-r--r-- | src/project.rs | 16 |
3 files changed, 61 insertions, 3 deletions
diff --git a/infra/host-retire-docker.sh b/infra/host-retire-docker.sh new file mode 100644 index 0000000..08923b7 --- /dev/null +++ b/infra/host-retire-docker.sh @@ -0,0 +1,31 @@ +#!/bin/sh +# Copyright (C) 2026 Doan Luu Duc Tai <doan@luuduct.ai> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +set -eu +[ "$(id -u)" = 0 ] || exit 1 +[ -z "$(docker ps -q)" ] || { echo 'Docker still has running containers'; exit 1; } +for host in doan.luuduct.ai git.doan.luuduct.ai search.doan.luuduct.ai; do + curl --fail --silent --resolve "$host:443:127.0.0.1" "https://$host/" >/dev/null +done +systemctl disable --now docker.service docker.socket containerd.service +apt-get purge -y docker-ce docker-ce-cli docker-buildx-plugin docker-compose-plugin containerd.io +for old in /var/lib/docker /var/lib/containerd /etc/docker /etc/containerd; do + if [ -d "$old" ] && [ ! -L "$old" ]; then find "$old" -depth -delete; fi +done +for old in /etc/apt/sources.list.d/docker.list /etc/apt/keyrings/docker.asc; do + if [ -f "$old" ]; then find "$old" -maxdepth 0 -delete; fi +done +echo 'Retired Docker packages, storage, and repository removed.' diff --git a/infra/podman.conf b/infra/podman.conf new file mode 100644 index 0000000..5e6965d --- /dev/null +++ b/infra/podman.conf @@ -0,0 +1,17 @@ +# Copyright (C) 2026 Doan Luu Duc Tai <doan@luuduct.ai> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. + +[network] +default_rootless_network_cmd = "slirp4netns" diff --git a/src/project.rs b/src/project.rs index bb96fe0..f952b26 100644 --- a/src/project.rs +++ b/src/project.rs @@ -170,6 +170,10 @@ impl Project { command.env("PATH", env::join_paths(paths)?); } if name == "podman" { + command.env( + "CONTAINERS_CONF_OVERRIDE", + self.root.join("infra/podman.conf"), + ); command .arg("--root") .arg(self.root.join("var/podman/storage")) @@ -424,12 +428,18 @@ impl Project { format!("127.0.0.1:{tls}:443"), format!("127.0.0.1:{tls}:443/udp"), ] + .to_vec() } else { [ - "80:80".to_owned(), - "443:443".to_owned(), - "443:443/udp".to_owned(), + "0.0.0.0:80:80", + "0.0.0.0:443:443", + "0.0.0.0:443:443/udp", + "[::]:80:80", + "[::]:443:443", + "[::]:443:443/udp", ] + .map(str::to_owned) + .to_vec() }; for port in ports { command.args(["--publish", &port]); |
