From 56dfa7a653663b82540c7ed825995f45b5d1949f Mon Sep 17 00:00:00 2001 From: Joachim Friberg Date: Thu, 19 Mar 2026 22:16:12 +0100 Subject: [PATCH] Enforce container name limit and update appstore push workflow --- AGENTS.md | 1 + Apps/docker-ip-addr-manager/HOW_TO_VERIFY.md | 2 +- .../docker-compose.yaml | 2 +- scripts/build-appstore-zip.sh | 55 +++++++++++++++++-- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index be54a77..f3d14f6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -16,6 +16,7 @@ Fokus: korrekthet, låg risk och underhållbarhet. - `docker-compose.yaml` - `README.md` (syfte, portar, volymer, privilegier, risker) - Compose ska ha giltig top-level `name` (gemener + bindestreck). +- Om `container_name` används måste den vara max 32 tecken och bara innehålla `0-9`, `a-z`, `A-Z`, `_`, `-`. - Endast `.yaml` används i repot (aldrig `.yml`). ## 3) Säkerhetsbaseline (Compose) diff --git a/Apps/docker-ip-addr-manager/HOW_TO_VERIFY.md b/Apps/docker-ip-addr-manager/HOW_TO_VERIFY.md index b5fefe0..1cf63dd 100644 --- a/Apps/docker-ip-addr-manager/HOW_TO_VERIFY.md +++ b/Apps/docker-ip-addr-manager/HOW_TO_VERIFY.md @@ -183,7 +183,7 @@ docker inspect docker-ip-addr-manager | jq '.[0].Config.Env' ```bash docker logs --tail 200 docker-ip-addr-manager -docker logs --tail 200 docker-ip-addr-manager-socket-proxy +docker logs --tail 200 docker-ip-addr-manager-proxy ``` - Konkreta felobservationer: diff --git a/Apps/docker-ip-addr-manager/docker-compose.yaml b/Apps/docker-ip-addr-manager/docker-compose.yaml index c1c8311..a1d6084 100644 --- a/Apps/docker-ip-addr-manager/docker-compose.yaml +++ b/Apps/docker-ip-addr-manager/docker-compose.yaml @@ -45,7 +45,7 @@ services: socket-proxy: image: lscr.io/linuxserver/socket-proxy:version-24.02.26 - container_name: docker-ip-addr-manager-socket-proxy + container_name: docker-ip-addr-manager-proxy restart: unless-stopped environment: TZ: Europe/Stockholm diff --git a/scripts/build-appstore-zip.sh b/scripts/build-appstore-zip.sh index ed175ef..cce95f3 100755 --- a/scripts/build-appstore-zip.sh +++ b/scripts/build-appstore-zip.sh @@ -2,21 +2,49 @@ set -euo pipefail repo_root="$(cd "$(dirname "$0")/.." && pwd)" -output_dir="${1:-$repo_root/dist}" -#zip_name="${2:-zima-appstore-$(date +%Y%m%d-%H%M%S).zip}" -zip_name="${2:-phirna-appstore.zip}" +push_mode=0 +positional=() + +while [[ $# -gt 0 ]]; do + case "$1" in + --push) + push_mode=1 + shift + ;; + -h|--help) + # handled below via usage + positional+=("$1") + shift + ;; + *) + positional+=("$1") + shift + ;; + esac +done + +if [[ ${#positional[@]} -gt 2 ]]; then + echo "ERROR: too many arguments" + exit 2 +fi + +output_dir="${positional[0]:-$repo_root/dist}" +#zip_name="${positional[1]:-zima-appstore-$(date +%Y%m%d-%H%M%S).zip}" +zip_name="${positional[1]:-phirna-appstore.zip}" usage() { cat </dev/null 2>&1; then else echo "ZIP created: $zip_path" fi + +if [[ "$push_mode" -eq 1 ]]; then + if [[ "$is_git_repo" -ne 1 ]]; then + echo "ERROR: --push requires a git repository" + exit 1 + fi + + echo "Push mode enabled: switching to main and publishing dist/" + git -C "$repo_root" checkout main + git -C "$repo_root" add dist/ + + if git -C "$repo_root" diff --cached --quiet; then + echo "No staged changes in dist/. Nothing to commit." + exit 0 + fi + + git -C "$repo_root" commit -m "Updated appstore" + git -C "$repo_root" push origin main +fi