Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1230 from bunkerity/dev

Browse source 
Merge branch "dev" into branch "staging"
This commit is contained in:
Théophile Diot 2024-05-31 08:52:30 +01:00 committed by GitHub
commit db30aaffbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/push-packagecloud.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- name: Install ruby
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
uses: ruby/setup-ruby@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
with:
ruby-version: "3.0"
- name: Install packagecloud

12
src/common/gen/save_config.py
View file

@ -230,12 +230,12 @@ if __name__ == "__main__":
for pod in kubernetes_client.list_pod_for_all_namespaces(watch=False).items:
if pod.metadata.annotations is not None and "bunkerweb.io/INSTANCE" in pod.metadata.annotations:
for env in pod.env:
for env in pod.spec.containers[0].env:
if custom_confs_rx.match(env.name):
custom_conf = custom_confs_rx.search(env.name).groups()
custom_confs.append(
{
"value": f"# CREATED BY ENV\n{env.value}",
"value": f"# CREATED BY ENV\n{env.value or ''}",
"exploded": (
custom_conf[0],
custom_conf[1],
@ -247,14 +247,14 @@ if __name__ == "__main__":
f"Found custom conf env var {'for service ' + custom_conf[0] if custom_conf[0] else 'without service'} with type {custom_conf[1]} and name {custom_conf[2]}"
)
else:
tmp_config[env.name] = env.value
tmp_config[env.name] = env.value or ""
if not db and env.name == "DATABASE_URI":
db = Database(logger, sqlalchemy_string=env.value)
db = Database(logger, sqlalchemy_string=env.value or "")
elif env.name == "API_HTTP_PORT":
api_http_port = env.value
api_http_port = env.value or ""
elif env.name == "API_SERVER_NAME":
api_server_name = env.value
api_server_name = env.value or ""
apis.append(
API(