diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 556f59f..71d0d36 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -6,7 +6,7 @@ jobs: - uses: actions/checkout@v3 - run: | set -x - ./dependencies.sh + LXC_IP_RANGE=10.0.9 ./dependencies.sh ./forgejo.sh setup root admin1234 codeberg.org/forgejo/forgejo:1.19 ./forgejo-runner.sh setup # testdata/run.sh workflow http://root:admin1234@$(cat forgejo-ip):3000 root demo diff --git a/dependencies.sh b/dependencies.sh index b8c6a71..a2069d4 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -2,6 +2,8 @@ set -x +: ${LXC_IP_RANGE:=10.0.8} + function install_docker() { if ! systemctl is-active --quiet docker; then echo deb http://deb.debian.org/debian bullseye-backports main | tee /etc/apt/sources.list.d/backports.list && apt-get update @@ -16,11 +18,11 @@ function install_lxc() { systemctl disable --now dnsmasq apt-get install -y -qq lxc systemctl stop lxc-net - cat >> /etc/default/lxc-net <<'EOF' -LXC_ADDR="10.0.8.1" + cat >> /etc/default/lxc-net <