diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index 90388e1c5..840b0fdd4 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:37 ENV OS=fedora ENV NGINX_VERSION 1.22.1 diff --git a/src/linux/fpm-fedora b/src/linux/fpm-fedora index 6db47c8fb..95ff1533e 100644 --- a/src/linux/fpm-fedora +++ b/src/linux/fpm-fedora @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends python3 --depends 'nginx = 1:1.22.1-2.fc36' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof +--depends bash --depends python3 --depends 'nginx = 1:1.22.1-1.fc37' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --description "BunkerWeb %VERSION% for Fedora 36" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/tests/Upgrade.py b/tests/Upgrade.py index 306028f1a..0f364b88b 100644 --- a/tests/Upgrade.py +++ b/tests/Upgrade.py @@ -67,6 +67,8 @@ if distro == "ubuntu": if bunkerweb_ui_state.stdout.decode().strip() != "active": bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) print("❌ bunkerweb-ui.service is not running. Logs:", bunkerweb_ui_logs.stdout.decode()) + else: + print("✔️ bunkerweb.service and bunkerweb-ui.service are running ✔️") #Checking Reloading test try: if bunkerweb_state.stdout.decode().strip() == "active": @@ -233,6 +235,8 @@ elif distro == "debian": if bunkerweb_ui_state.stdout.decode().strip() != "active": bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-debian", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) print("❌ bunkerweb-ui.service is not running. Logs:", bunkerweb_ui_logs.stdout.decode()) + else: + print("✔️ bunkerweb.service and bunkerweb-ui.service are running ✔️") #Checking Reloading test try: if bunkerweb_state.stdout.decode().strip() == "active": @@ -337,30 +341,32 @@ elif distro == "debian": sys.exit(1) elif distro == "fedora": - subprocess.run(["docker", "build", "-t", "fedora-image", "-f", "../src/linux/Dockerfile-fedora", "."]) + test_results = {"Installation test": None, "Reloading test": None, "Removing test": None, "Purging test": None, "Upgrading test": None} + subprocess.run(["docker", "build", "-t", "fedora-image", "-f", "src/linux/Dockerfile-fedora", "."]) subprocess.run(["docker", "run", "-it", "--name", "fedora-container", "-v", "deb:/data", "fedora-image"]) subprocess.run(["docker", "run", "-d", "--name", "systemd-{}".format(distro), "--privileged", "-v", "/sys/fs/cgroup:/sys/fs/cgroup", "-v", "deb:/data", "jrei/systemd-fedora"]) # Installing test print("Installing bunkerweb...") bash_script = """ - dnf install -y nginx-1.20.2 - apt install /data/bunkerweb.deb -y + dnf update -y + dnf install -y curl gnupg2 ca-certificates redhat-lsb-core + dnf install -y nginx-1.22.1-1.fc37 + dnf install /data/bunkerweb.rpm -y """ with tempfile.NamedTemporaryFile(mode='w') as f: f.write(bash_script) f.flush() - subprocess.run(["docker", "cp", f.name, "systemd-ubuntu:/tmp/install_nginx.sh"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "/tmp/install_nginx.sh"]) + subprocess.run(["docker", "cp", f.name, "systemd-fedora:/data/install_nginx.sh"]) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "/data/install_nginx.sh"]) if result.returncode != 0: - bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl status bunkerweb.service"], capture_output=True) + bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl status bunkerweb.service"], capture_output=True) print("Logs from bunkerweb:", bunkerweb_logs.stdout.decode()) - bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl status bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl status bunkerweb-ui.service"], capture_output=True) print("Logs from bunkerweb-ui:", bunkerweb_ui_logs.stdout.decode()) sys.exit(result.returncode) - exit(result.returncode) else: print("✔️ Installation successful ✔️") #Checking Installation test @@ -376,81 +382,80 @@ elif distro == "fedora": # Reloading test print("Reloading bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "echo 'HTTPS_PORT=8443' >> /etc/bunkerweb/variables.env"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "echo 'new_value=1' >> /etc/bunkerweb/ui.env"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl reload bunkerweb"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl reload bunkerweb-ui"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "echo 'HTTPS_PORT=8443' >> /etc/bunkerweb/variables.env"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "echo 'new_value=1' >> /etc/bunkerweb/ui.env"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl reload bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl reload bunkerweb-ui"]) - bunkerweb_state = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl is-active bunkerweb.service"], capture_output=True) + bunkerweb_state = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl is-active bunkerweb.service"], capture_output=True) if bunkerweb_state.stdout.decode().strip() != "active": - bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "journalctl -u bunkerweb.service"], capture_output=True) + bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "journalctl -u bunkerweb.service"], capture_output=True) print("❌ bunkerweb.service is not running. Logs:", bunkerweb_logs.stdout.decode()) sys.exit(1) - bunkerweb_ui_state = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl is-active bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_state = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "systemctl is-active bunkerweb-ui.service"], capture_output=True) if bunkerweb_ui_state.stdout.decode().strip() != "active": - bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) print("❌ bunkerweb-ui.service is not running. Logs:", bunkerweb_ui_logs.stdout.decode()) sys.exit(1) + else: + print("✔️ bunkerweb.service and bunkerweb-ui.service are running ✔️") #Checking Reloading test try: if bunkerweb_state.stdout.decode().strip() == "active": test_results["Reloading test"] = "OK" else: test_results["Reloading test"] = "KO" - sys.exit(1) except: test_results["Reloading test"] = "KO" - sys.exit(1) # Removing test print("Removing bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "apt remove -y bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "dnf remove -y bunkerweb"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /usr/share/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -d /usr/share/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /usr/share/bunkerweb not found.") else: print("❌ /usr/share/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/tmp/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -d /var/tmp/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/tmp/bunkerweb not found.") else: print("❌ /var/tmp/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/cache/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -d /var/cache/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/cache/bunkerweb not found.") else: print("❌ /var/cache/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -f /usr/bin/bwcli ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -f /usr/bin/bwcli ]"], capture_output=True) if result.returncode != 0: print("✔️ /usr/bin/bwcli not found.") else: print("❌ /usr/bin/bwcli found.") #Checking Removing test try: - if not os.path.isdir("/usr/share/bunkerweb") and not os.path.isdir("/var/tmp/bunkerweb") and not os.path.isdir("/var/cache/bunkerweb") and not os.path.isfile("/usr/bin/bwcli"): - test_results["Removing test"] = "OK" - else: + if os.path.exists("/usr/share/bunkerweb") or os.path.exists("/var/tmp/bunkerweb") or os.path.exists("/var/cache/bunkerweb") or os.path.exists("/usr/bin/bwcli"): test_results["Removing test"] = "KO" - sys.exit(1) + else: + test_results["Removing test"] = "OK" except: test_results["Removing test"] = "KO" # Purging test print("Purging bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "apt purge -y bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "dnf purge -y bunkerweb"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/lib/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -d /var/lib/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/lib/bunkerweb not found.") else: print("❌ /var/lib/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /etc/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "[ -d /etc/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /etc/bunkerweb not found.") else: @@ -461,39 +466,35 @@ elif distro == "fedora": test_results["Purging test"] = "OK" else: test_results["Purging test"] = "KO" - sys.exit(1) except: test_results["Purging test"] = "KO" - sys.exit(1) # Upgrading test print("Upgrading bunkerweb...") # Installing official package - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt remove -y nginx"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y nginx=1.20.2-1~jammy"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt update"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y bunkerweb=1.4.5"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "sudo dnf remove -y nginx"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "sudo dnf install -y nginx=1.20.2-1~jammy"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "sudo dnf update"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "sudo dnf install -y bunkerweb=1.4.5"]) # Checking version - old_version = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) + old_version = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) print("Old version:", old_version.stdout.decode().strip()) # Upgrading package - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y /data/bunkerweb.deb"]) + subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "sudo dnf install -y /data/bunkerweb.deb"]) # Checking version - new_version = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) + new_version = subprocess.run(["docker", "exec", "-it", "systemd-fedora", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) print("New version:", new_version.stdout.decode().strip()) try: if old_version.stdout.decode().strip() != new_version.stdout.decode().strip(): test_results["Upgrading test"] = "OK" else: test_results["Upgrading test"] = "KO" - sys.exit(1) except: test_results["Upgrading test"] = "KO" - sys.exit(1) # Print summary for key, value in test_results.items(): @@ -504,27 +505,27 @@ elif distro == "fedora": elif distro == "rhel": print("RHEL not supported yet.") elif distro == "centos": - subprocess.run(["docker", "build", "-t", "centos-image", "-f", "../src/linux/Dockerfile-centos", "."]) + subprocess.run(["docker", "build", "-t", "centos-image", "-f", "src/linux/Dockerfile-centos", "."]) subprocess.run(["docker", "run", "-it", "--name", "centos-container", "-v", "deb:/data", "centos-image"]) subprocess.run(["docker", "run", "-d", "--name", "systemd-{}".format(distro), "--privileged", "-v", "/sys/fs/cgroup:/sys/fs/cgroup", "-v", "deb:/data", "quay.io/centos/centos:stream8"]) # Installing test print("Installing bunkerweb...") bash_script = """ - dnf install -y nginx-1.20.2 + dnf install -y nginx-1.22.1 apt install /data/bunkerweb.deb -y """ with tempfile.NamedTemporaryFile(mode='w') as f: f.write(bash_script) f.flush() - subprocess.run(["docker", "cp", f.name, "systemd-ubuntu:/tmp/install_nginx.sh"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "/tmp/install_nginx.sh"]) + subprocess.run(["docker", "cp", f.name, "systemd-centos:/tmp/install_nginx.sh"]) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "/tmp/install_nginx.sh"]) if result.returncode != 0: - bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl status bunkerweb.service"], capture_output=True) + bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl status bunkerweb.service"], capture_output=True) print("Logs from bunkerweb:", bunkerweb_logs.stdout.decode()) - bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl status bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl status bunkerweb-ui.service"], capture_output=True) print("Logs from bunkerweb-ui:", bunkerweb_ui_logs.stdout.decode()) sys.exit(result.returncode) exit(result.returncode) @@ -543,20 +544,20 @@ elif distro == "centos": # Reloading test print("Reloading bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "echo 'HTTPS_PORT=8443' >> /etc/bunkerweb/variables.env"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "echo 'new_value=1' >> /etc/bunkerweb/ui.env"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl reload bunkerweb"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl reload bunkerweb-ui"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "echo 'HTTPS_PORT=8443' >> /etc/bunkerweb/variables.env"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "echo 'new_value=1' >> /etc/bunkerweb/ui.env"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl reload bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl reload bunkerweb-ui"]) - bunkerweb_state = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl is-active bunkerweb.service"], capture_output=True) + bunkerweb_state = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl is-active bunkerweb.service"], capture_output=True) if bunkerweb_state.stdout.decode().strip() != "active": - bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "journalctl -u bunkerweb.service"], capture_output=True) + bunkerweb_logs = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "journalctl -u bunkerweb.service"], capture_output=True) print("❌ bunkerweb.service is not running. Logs:", bunkerweb_logs.stdout.decode()) sys.exit(1) - bunkerweb_ui_state = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "systemctl is-active bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_state = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "systemctl is-active bunkerweb-ui.service"], capture_output=True) if bunkerweb_ui_state.stdout.decode().strip() != "active": - bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) + bunkerweb_ui_logs = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "journalctl -u bunkerweb-ui.service"], capture_output=True) print("❌ bunkerweb-ui.service is not running. Logs:", bunkerweb_ui_logs.stdout.decode()) sys.exit(1) #Checking Reloading test @@ -572,27 +573,27 @@ elif distro == "centos": # Removing test print("Removing bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "apt remove -y bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "apt remove -y bunkerweb"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /usr/share/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -d /usr/share/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /usr/share/bunkerweb not found.") else: print("❌ /usr/share/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/tmp/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -d /var/tmp/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/tmp/bunkerweb not found.") else: print("❌ /var/tmp/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/cache/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -d /var/cache/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/cache/bunkerweb not found.") else: print("❌ /var/cache/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -f /usr/bin/bwcli ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -f /usr/bin/bwcli ]"], capture_output=True) if result.returncode != 0: print("✔️ /usr/bin/bwcli not found.") else: @@ -609,15 +610,15 @@ elif distro == "centos": # Purging test print("Purging bunkerweb...") - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "apt purge -y bunkerweb"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "apt purge -y bunkerweb"]) - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /var/lib/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -d /var/lib/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /var/lib/bunkerweb not found.") else: print("❌ /var/lib/bunkerweb found.") - result = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "[ -d /etc/bunkerweb ]"], capture_output=True) + result = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "[ -d /etc/bunkerweb ]"], capture_output=True) if result.returncode != 0: print("✔️ /etc/bunkerweb not found.") else: @@ -636,21 +637,21 @@ elif distro == "centos": # Upgrading test print("Upgrading bunkerweb...") # Installing official package - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt remove -y nginx"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y nginx=1.20.2-1~jammy"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt update"]) - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y bunkerweb=1.4.5"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "sudo apt remove -y nginx"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "sudo apt install -y nginx=1.20.2-1~jammy"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "sudo apt update"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "sudo apt install -y bunkerweb=1.4.5"]) # Checking version - old_version = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) + old_version = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) print("Old version:", old_version.stdout.decode().strip()) # Upgrading package - subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "sudo apt install -y /data/bunkerweb.deb"]) + subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "sudo apt install -y /data/bunkerweb.deb"]) # Checking version - new_version = subprocess.run(["docker", "exec", "-it", "systemd-ubuntu", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) + new_version = subprocess.run(["docker", "exec", "-it", "systemd-centos", "bash", "-c", "cat /usr/share/bunkerweb/VERSION"], capture_output=True) print("New version:", new_version.stdout.decode().strip()) try: if old_version.stdout.decode().strip() != new_version.stdout.decode().strip():