mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-08-11 17:50:58 +00:00
Merge pull request 'fix: ensure the LXC template does not have obsolete APT' (#102) from earl-warren/act:wip-apt-old into main
Reviewed-on: https://code.forgejo.org/forgejo/act/pulls/102 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
earl-warren
commit
ea79e3de41
3 changed files with 134 additions and 106 deletions
|
|
@ -3,13 +3,14 @@
|
|||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
LXC_SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
LXC_SELF_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LXC_BIN=/usr/local/bin
|
||||
LXC_CONTAINER_CONFIG_ALL="unprivileged lxc libvirt docker k8s"
|
||||
LXC_CONTAINER_CONFIG_DEFAULT="lxc libvirt docker"
|
||||
LXC_IPV6_PREFIX_DEFAULT="fc15"
|
||||
LXC_IPV6_PREFIX_DEFAULT="fd15"
|
||||
LXC_DOCKER_PREFIX_DEFAULT="172.17"
|
||||
LXC_IPV6_DOCKER_PREFIX_DEFAULT="fd00:d0ca"
|
||||
LXC_APT_TOO_OLD='1 week ago'
|
||||
|
||||
: ${LXC_SUDO:=}
|
||||
: ${LXC_CONTAINER_RELEASE:=bookworm}
|
||||
|
|
@ -75,14 +76,14 @@ function lxc_container_user_install() {
|
|||
local user_id="$2"
|
||||
local user="$3"
|
||||
|
||||
if test "$user" = root ; then
|
||||
if test "$user" = root; then
|
||||
return
|
||||
fi
|
||||
|
||||
local root=$(lxc_root $name)
|
||||
|
||||
if ! $LXC_SUDO grep --quiet "^$user " $root/etc/sudoers ; then
|
||||
$LXC_SUDO tee $root/usr/local/bin/lxc-helpers-create-user.sh > /dev/null <<EOF
|
||||
if ! $LXC_SUDO grep --quiet "^$user " $root/etc/sudoers; then
|
||||
$LXC_SUDO tee $root/usr/local/bin/lxc-helpers-create-user.sh >/dev/null <<EOF
|
||||
#!/bin/bash
|
||||
set -ex
|
||||
|
||||
|
|
@ -99,14 +100,14 @@ EOF
|
|||
}
|
||||
|
||||
function lxc_maybe_sudo() {
|
||||
if test $(id -u) != 0 ; then
|
||||
if test $(id -u) != 0; then
|
||||
LXC_SUDO=sudo
|
||||
fi
|
||||
}
|
||||
|
||||
function lxc_prepare_environment() {
|
||||
lxc_maybe_sudo
|
||||
if ! $(which lxc-create > /dev/null) ; then
|
||||
if ! $(which lxc-create >/dev/null); then
|
||||
$LXC_SUDO apt-get install -y -qq make git libvirt0 libpam-cgfs bridge-utils uidmap dnsmasq-base dnsmasq dnsmasq-utils qemu-user-static
|
||||
fi
|
||||
}
|
||||
|
|
@ -194,10 +195,9 @@ EOF
|
|||
}
|
||||
|
||||
function lxc_container_config() {
|
||||
for config in "$@" ; do
|
||||
for config in "$@"; do
|
||||
case $config in
|
||||
unprivileged)
|
||||
;;
|
||||
unprivileged) ;;
|
||||
lxc)
|
||||
echo nesting
|
||||
echo cap
|
||||
|
|
@ -225,7 +225,7 @@ function lxc_container_config() {
|
|||
return 1
|
||||
;;
|
||||
esac
|
||||
done | sort -u | while read config ; do
|
||||
done | sort -u | while read config; do
|
||||
echo "#"
|
||||
echo "# include $config config snippet"
|
||||
echo "#"
|
||||
|
|
@ -247,7 +247,7 @@ function lxc_container_install_lxc_helpers() {
|
|||
# Wait for the network to come up
|
||||
#
|
||||
local wait_networking=$(lxc_root $name)/usr/local/bin/lxc-helpers-wait-networking.sh
|
||||
$LXC_SUDO tee $wait_networking > /dev/null <<'EOF'
|
||||
$LXC_SUDO tee $wait_networking >/dev/null <<'EOF'
|
||||
#!/bin/sh -e
|
||||
for d in $(seq 60); do
|
||||
getent hosts wikipedia.org > /dev/null && break
|
||||
|
|
@ -271,17 +271,16 @@ function lxc_container_mount() {
|
|||
|
||||
local config=$(lxc_config $name)
|
||||
|
||||
if ! $LXC_SUDO grep --quiet "lxc.mount.entry = $dir" $config ; then
|
||||
if ! $LXC_SUDO grep --quiet "lxc.mount.entry = $dir" $config; then
|
||||
local relative_dir=${dir##/}
|
||||
$LXC_SUDO tee -a $config > /dev/null <<< "lxc.mount.entry = $dir $relative_dir none bind,create=dir 0 0"
|
||||
$LXC_SUDO tee -a $config >/dev/null <<<"lxc.mount.entry = $dir $relative_dir none bind,create=dir 0 0"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function lxc_container_start() {
|
||||
local name="$1"
|
||||
|
||||
if lxc_running $name ; then
|
||||
if lxc_running $name; then
|
||||
return
|
||||
fi
|
||||
|
||||
|
|
@ -298,7 +297,7 @@ function lxc_container_start() {
|
|||
function lxc_container_stop() {
|
||||
local name="$1"
|
||||
|
||||
$LXC_SUDO lxc-ls -1 --running --filter="^$name" | while read container ; do
|
||||
$LXC_SUDO lxc-ls -1 --running --filter="^$name" | while read container; do
|
||||
$LXC_SUDO lxc-stop --kill --name="$container"
|
||||
done
|
||||
}
|
||||
|
|
@ -307,7 +306,7 @@ function lxc_container_destroy() {
|
|||
local name="$1"
|
||||
local root="$2"
|
||||
|
||||
if lxc_exists "$name" ; then
|
||||
if lxc_exists "$name"; then
|
||||
lxc_container_stop $name $root
|
||||
$LXC_SUDO lxc-destroy --force --name="$name"
|
||||
fi
|
||||
|
|
@ -319,6 +318,21 @@ function lxc_exists() {
|
|||
test "$($LXC_SUDO lxc-ls --filter=^$name\$)"
|
||||
}
|
||||
|
||||
function lxc_exists_and_apt_not_old() {
|
||||
local name="$1"
|
||||
|
||||
if lxc_exists $name; then
|
||||
if lxc_apt_is_old $name; then
|
||||
$LXC_SUDO lxc-destroy --force --name="$name"
|
||||
return 1
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
function lxc_running() {
|
||||
local name="$1"
|
||||
|
||||
|
|
@ -328,7 +342,7 @@ function lxc_running() {
|
|||
function lxc_build_template_release() {
|
||||
local name="$(lxc_template_release)"
|
||||
|
||||
if lxc_exists $name ; then
|
||||
if lxc_exists_and_apt_not_old $name; then
|
||||
return
|
||||
fi
|
||||
|
||||
|
|
@ -346,21 +360,35 @@ function lxc_build_template() {
|
|||
local name="$1"
|
||||
local newname="$2"
|
||||
|
||||
if lxc_exists $newname ; then
|
||||
if lxc_exists_and_apt_not_old $newname; then
|
||||
return
|
||||
fi
|
||||
|
||||
if test "$name" = "$(lxc_template_release)" ; then
|
||||
if test "$name" = "$(lxc_template_release)"; then
|
||||
lxc_build_template_release
|
||||
fi
|
||||
|
||||
if ! $LXC_SUDO lxc-copy --name=$name --newname=$newname ; then
|
||||
if ! $LXC_SUDO lxc-copy --name=$name --newname=$newname; then
|
||||
echo lxc-copy --name=$name --newname=$newname failed
|
||||
return 1
|
||||
fi
|
||||
lxc_container_configure $newname
|
||||
}
|
||||
|
||||
function lxc_apt_age() {
|
||||
local name="$1"
|
||||
$LXC_SUDO stat --format %Y $(lxc_root $name)/var/cache/apt/pkgcache.bin
|
||||
}
|
||||
|
||||
function lxc_apt_is_old() {
|
||||
local name="$1"
|
||||
|
||||
local age=$(lxc_apt_age $name)
|
||||
local too_old=$(date --date "$LXC_APT_TOO_OLD" +%s)
|
||||
|
||||
test $age -lt $too_old
|
||||
}
|
||||
|
||||
function lxc_apt_install() {
|
||||
local name="$1"
|
||||
shift
|
||||
|
|
@ -385,19 +413,19 @@ function lxc_install_lxc_inside() {
|
|||
local prefixv6="${2:-$LXC_IPV6_PREFIX_DEFAULT}"
|
||||
|
||||
local packages="make git libvirt0 libpam-cgfs bridge-utils uidmap dnsmasq-base dnsmasq dnsmasq-utils qemu-user-static lxc-templates debootstrap"
|
||||
if test "$(lxc_release)" = bookworm ; then
|
||||
if test "$(lxc_release)" = bookworm; then
|
||||
packages="$packages distro-info"
|
||||
fi
|
||||
|
||||
lxc_apt_install_inside $packages
|
||||
|
||||
if ! grep --quiet LXC_ADDR=.$prefix.1. /etc/default/lxc-net ; then
|
||||
if ! grep --quiet LXC_ADDR=.$prefix.1. /etc/default/lxc-net; then
|
||||
systemctl disable --now dnsmasq
|
||||
apt-get install -y -qq lxc
|
||||
systemctl stop lxc-net
|
||||
sed -i -e '/ConditionVirtualization/d' /usr/lib/systemd/system/lxc-net.service
|
||||
systemctl daemon-reload
|
||||
cat >> /etc/default/lxc-net <<EOF
|
||||
cat >>/etc/default/lxc-net <<EOF
|
||||
LXC_ADDR="$prefix.1"
|
||||
LXC_NETMASK="255.255.255.0"
|
||||
LXC_NETWORK="$prefix.0/24"
|
||||
|
|
@ -420,7 +448,7 @@ function lxc_install_docker() {
|
|||
|
||||
function lxc_install_docker_inside() {
|
||||
mkdir /etc/docker
|
||||
cat > /etc/docker/daemon.json <<EOF
|
||||
cat >/etc/docker/daemon.json <<EOF
|
||||
{
|
||||
"ipv6": true,
|
||||
"fixed-cidr-v6": "$LXC_IPV6_DOCKER_PREFIX_DEFAULT:1::/64",
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ ACTIONS IN THE CONTAINER
|
|||
Install LXC in the `name` container to allow the creation of
|
||||
named containers. `prefix` is a class C IP prefix from which
|
||||
containers will obtain their IP (for instance 10.40.50). `prefixv6`
|
||||
is an optional IPv6 private address prefix that defaults to fc15.
|
||||
is an optional IPv6 private address prefix that defaults to fd15.
|
||||
|
||||
lxc_container_run `name` command [options...]
|
||||
|
||||
|
|
|
|||
|
|
@ -222,8 +222,8 @@ EOF
|
|||
function build_template_act() {
|
||||
local name="$(template_act)"
|
||||
|
||||
if lxc_exists $name ; then
|
||||
return
|
||||
if lxc_exists_and_apt_not_old $name ; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
lxc_build_template $(lxc_template_release) $name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue