fix missing vars
This commit is contained in:
1 parent
a3797988c2
commit
d3162cbb9b
1 file changed
+11
-6
@@ -262,6 +262,10 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
HISTORY_CONTENT=$(cat VERSION.history)
|
HISTORY_CONTENT=$(cat VERSION.history)
|
||||||
|
|
||||||
|
export CURRENT_TIME
|
||||||
|
export HISTORY_CONTENT
|
||||||
|
export BASE_IMAGE="$BASE_IMAGE"
|
||||||
|
|
||||||
ENV_BLOCK_CONTENT=""
|
ENV_BLOCK_CONTENT=""
|
||||||
env_vars=$(grep '^ENV_' buildargs.env | grep -v '^#' | tr -d '\r' || true)
|
env_vars=$(grep '^ENV_' buildargs.env | grep -v '^#' | tr -d '\r' || true)
|
||||||
if [ -n "$env_vars" ]; then
|
if [ -n "$env_vars" ]; then
|
||||||
@@ -357,7 +361,6 @@ jobs:
|
|||||||
|
|
||||||
with open("docker-compose.yml", "w", encoding="utf-8") as f:
|
with open("docker-compose.yml", "w", encoding="utf-8") as f:
|
||||||
f.write(content)
|
f.write(content)
|
||||||
print("✅ docker-compose.yml erfolgreich generiert!")
|
|
||||||
|
|
||||||
# 2. README.md aus rm.template generieren
|
# 2. README.md aus rm.template generieren
|
||||||
readme_template = ".gitea/rm.template" if os.path.exists(".gitea/rm.template") else "rm.template"
|
readme_template = ".gitea/rm.template" if os.path.exists(".gitea/rm.template") else "rm.template"
|
||||||
@@ -366,9 +369,10 @@ jobs:
|
|||||||
rm_content = f.read()
|
rm_content = f.read()
|
||||||
|
|
||||||
description = os.environ.get("DESCRIPTION", "Docker Image for samba-ad-dc")
|
description = os.environ.get("DESCRIPTION", "Docker Image for samba-ad-dc")
|
||||||
current_date = os.environ.get("CURRENT_TIME", "07.06.2026") # oder aktuelles Datum
|
current_date = os.environ.get("CURRENT_TIME", "")
|
||||||
|
history_content = os.environ.get("HISTORY_CONTENT", "")
|
||||||
|
base_image = os.environ.get("BASE_IMAGE", "debian:trixie-slim")
|
||||||
|
|
||||||
# Docker Compose Inhalt einlesen
|
|
||||||
compose_content = open("docker-compose.yml", "r", encoding="utf-8").read() if os.path.exists("docker-compose.yml") else ""
|
compose_content = open("docker-compose.yml", "r", encoding="utf-8").read() if os.path.exists("docker-compose.yml") else ""
|
||||||
docker_run_content = open("docker_run_block.txt", "r", encoding="utf-8").read() if os.path.exists("docker_run_block.txt") else ""
|
docker_run_content = open("docker_run_block.txt", "r", encoding="utf-8").read() if os.path.exists("docker_run_block.txt") else ""
|
||||||
|
|
||||||
@@ -377,13 +381,14 @@ jobs:
|
|||||||
rm_content = rm_content.replace("__BUILD_TAG__", os.environ.get("FINAL_TAG", "trixie"))
|
rm_content = rm_content.replace("__BUILD_TAG__", os.environ.get("FINAL_TAG", "trixie"))
|
||||||
rm_content = rm_content.replace("__FULL_URL__", "git.pi-farm.de/pi-farm/samba-ad-dc")
|
rm_content = rm_content.replace("__FULL_URL__", "git.pi-farm.de/pi-farm/samba-ad-dc")
|
||||||
rm_content = rm_content.replace("__DESCRIPTION__", description)
|
rm_content = rm_content.replace("__DESCRIPTION__", description)
|
||||||
rm_content = rm_content.replace("__BASE_IMAGE__", os.environ.get("BASE_IMAGE", "debian:trixie-slim"))
|
rm_content.replace("__BASE_IMAGE__", base_image) # Korrigiert: base_image Variable nutzen
|
||||||
|
rm_content = rm_content.replace("__BASE_IMAGE__", base_image)
|
||||||
rm_content = rm_content.replace("__ARM_STATUS__", "✅ Active" if os.path.exists("Dockerfile.aarch64") else "❌ Not supported")
|
rm_content = rm_content.replace("__ARM_STATUS__", "✅ Active" if os.path.exists("Dockerfile.aarch64") else "❌ Not supported")
|
||||||
rm_content = rm_content.replace("__COMPOSE_BLOCK__", compose_content)
|
rm_content = rm_content.replace("__COMPOSE_BLOCK__", compose_content)
|
||||||
rm_content = rm_content.replace("__DOCKER_RUN__", docker_run_content)
|
rm_content = rm_content.replace("__DOCKER_RUN__", docker_run_content)
|
||||||
rm_content = rm_content.replace("__DOCKERHUB_LINK__", os.environ.get("DOCKERHUB_LINK_CONTENT", ""))
|
rm_content = rm_content.replace("__DOCKERHUB_LINK__", os.environ.get("DOCKERHUB_LINK_CONTENT", ""))
|
||||||
rm_content = rm_content.replace("__CURRENT_DATE__", os.environ.get("CURRENT_TIME", ""))
|
rm_content = rm_content.replace("__CURRENT_DATE__", current_date)
|
||||||
rm_content = rm_content.replace("__HISTORY_CONTENT__", os.environ.get("HISTORY_CONTENT", ""))
|
rm_content = rm_content.replace("__HISTORY_CONTENT__", history_content)
|
||||||
|
|
||||||
with open("README.md", "w", encoding="utf-8") as f:
|
with open("README.md", "w", encoding="utf-8") as f:
|
||||||
f.write(rm_content)
|
f.write(rm_content)
|
||||||
|
|||||||
Reference in new issue
Block a user