mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
ci/cd - various fixes
This commit is contained in:
parent
e8ee460efc
commit
f07c0e66a3
4 changed files with 20 additions and 4 deletions
|
@ -13,7 +13,7 @@ from API import API
|
|||
if "/usr/share/bunkerweb/deps/python" not in sys_path:
|
||||
sys_path.append("/usr/share/bunkerweb/deps/python")
|
||||
|
||||
from kubernetes import client as kube_client
|
||||
from kubernetes import client as kube_client, config
|
||||
from docker import DockerClient
|
||||
|
||||
|
||||
|
@ -30,6 +30,7 @@ class ApiCaller:
|
|||
bw_integration = "Swarm"
|
||||
|
||||
if bw_integration == "Kubernetes":
|
||||
config.load_incluster_config()
|
||||
corev1 = kube_client.CoreV1Api()
|
||||
for pod in corev1.list_pod_for_all_namespaces(watch=False).items:
|
||||
if (
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
--license agpl3
|
||||
--version %VERSION%
|
||||
--architecture x86_64
|
||||
--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof
|
||||
--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends brotli
|
||||
--description "BunkerWeb %VERSION% for CentOS Stream 8"
|
||||
--url "https://www.bunkerweb.io"
|
||||
--maintainer "Bunkerity <contact at bunkerity dot com>"
|
||||
|
|
|
@ -6,7 +6,7 @@ from traceback import format_exc
|
|||
from subprocess import run
|
||||
from time import sleep
|
||||
from logger import log
|
||||
|
||||
from yaml import safe_load_all, dump
|
||||
|
||||
class KubernetesTest(Test):
|
||||
def __init__(self, name, timeout, tests, delay=0):
|
||||
|
@ -45,6 +45,14 @@ class KubernetesTest(Test):
|
|||
mkdir("/tmp/kubernetes")
|
||||
copy("./misc/integrations/k8s.mariadb.yml", "/tmp/kubernetes/bunkerweb.yml")
|
||||
deploy = "/tmp/kubernetes/bunkerweb.yml"
|
||||
# with open(deploy, "r") as f :
|
||||
# data = safe_load_all(f.read())
|
||||
# for
|
||||
# if not "AUTO_LETS_ENCRYPT=yes" in data["services"]["bunkerweb"]["environment"] :
|
||||
# data["services"]["bunkerweb"]["environment"].append("AUTO_LETS_ENCRYPT=yes")
|
||||
# data["services"]["bunkerweb"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes")
|
||||
# with open(compose, "w") as f :
|
||||
# f.write(data)
|
||||
Test.replace_in_file(
|
||||
deploy,
|
||||
r"bunkerity/bunkerweb:.*$",
|
||||
|
|
|
@ -6,7 +6,7 @@ from traceback import format_exc
|
|||
from subprocess import run
|
||||
from time import sleep
|
||||
from logger import log
|
||||
|
||||
from yaml import safe_load, dump
|
||||
|
||||
class SwarmTest(Test):
|
||||
def __init__(self, name, timeout, tests, delay=0):
|
||||
|
@ -32,6 +32,13 @@ class SwarmTest(Test):
|
|||
mkdir("/tmp/swarm")
|
||||
copy("./misc/integrations/swarm.mariadb.yml", "/tmp/swarm/stack.yml")
|
||||
compose = "/tmp/swarm/stack.yml"
|
||||
with open(compose, "r") as f :
|
||||
data = safe_load(f.read())
|
||||
if not "AUTO_LETS_ENCRYPT=yes" in data["services"]["bunkerweb"]["environment"] :
|
||||
data["services"]["bunkerweb"]["environment"].append("AUTO_LETS_ENCRYPT=yes")
|
||||
data["services"]["bunkerweb"]["environment"].append("USE_LETS_ENCRYPT_STAGING=yes")
|
||||
with open(compose, "w") as f :
|
||||
f.write(data)
|
||||
Test.replace_in_file(
|
||||
compose,
|
||||
r"bunkerity/bunkerweb:.*$",
|
||||
|
|
Loading…
Reference in a new issue