Versione 0.1.46

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GiECd9KMfjthRUnujCGSzZ

Dockerfile

@@ -17,9 +17,15 @@ COPY assets/favicon /usr/share/nginx/html/assets/favicon
 COPY assets/video /usr/share/nginx/html/assets/video
 
 # Le immagini e i font citati da index.html e style.css prendono ?v=<versione>, come quelli caricati dal codice.
+# Alla versione si aggiunge l'impronta del contenuto di assets/: uno sfondo rifatto senza cambiare versione (in
+# locale, fra un bump e l'altro) ha un indirizzo nuovo, e il browser non tiene quello vecchio dalla cache lunga.
 RUN cd /usr/share/nginx/html \
  && V=$(sed -n "s/^export const VERSION = '\([0-9.]*\)';$/\1/p" src/version.js) \
  && test -n "$V" \
+ && H=$(find assets -type f -exec md5sum {} + | sort -k2 | md5sum | cut -c1-8) \
+ && sed -i -E 's#v=\$\{VERSION\}#v=${VERSION}-'"$H"'#' src/version.js \
+ && grep -q "VERSION}-$H" src/version.js \
+ && V="$V-$H" \
  && sed -i -E "s#url\((assets/[^)]*)\)#url(\1?v=$V)#g" style.css \
  && sed -i -E "s#src=\"(assets/[^\"]*)\"#src=\"\1?v=$V\"#g" index.html \
  && grep -q "?v=$V" style.css && grep -q "?v=$V" index.html

Makefile

@@ -24,7 +24,7 @@ CROP        ?=
 COLORS      ?= 64
 
 .PHONY: help serve open test browser verify check-public bump voci voci-elenco sfondi sfondi-genera sfondi-confronto background character \
-        build up down restart logs ps shell image-size deploy deploy-logs clean distclean
+        build up down restart logs ps shell image-size deploy deploy-vps deploy-logs clean distclean
 
 ## ------------------------------------------------------------ sviluppo
 
@@ -124,6 +124,8 @@ image-size: ## Dimensione dell'immagine
 # Host e indirizzo stanno in deploy.local.mk, fuori da git, per esempio:
 #   DEPLOY_HOST = root@mio-server
 #   DEPLOY_URL  = https://gioco.esempio
+#   VPS_HOST    = mio-vps                    (facoltativo: una seconda copia, con make deploy-vps)
+#   VPS_DIR     = docker/leggenda-regolo
 -include deploy.local.mk
 DEPLOY_DIR  ?= /root/leggenda-regolo
 DEPLOY_TMP  := $(shell mktemp -d -u /tmp/regolo-deploy.XXXXXX)
@@ -151,6 +153,16 @@ deploy: ## Pubblica l'ultimo commit: test, immagine costruita e provata qui, spe
 	  xargs -r -I{} docker image rm -f $(IMAGE):{} >/dev/null
 	@echo "→ $(DEPLOY_URL) ($$(git log -1 --format='%h %s'))"
 
+deploy-vps: ## Spedisce al VPS (VPS_HOST, VPS_DIR in deploy.local.mk) l'immagine dell'ultimo commit già provata da make deploy
+	@test -n "$(VPS_HOST)" -a -n "$(VPS_DIR)" || { echo "mancano VPS_HOST e VPS_DIR: scrivili in deploy.local.mk"; exit 2; }
+	@docker image inspect $(IMAGE):$$(git rev-parse --short HEAD) >/dev/null 2>&1 || \
+	  { echo "manca l'immagine dell'ultimo commit ($$(git rev-parse --short HEAD)): prima make deploy"; exit 1; }
+	ssh $(VPS_HOST) 'mkdir -p $(VPS_DIR)'
+	git show HEAD:docker-compose.homeserver.yml | ssh $(VPS_HOST) 'cat > $(VPS_DIR)/docker-compose.yml'
+	docker save $(IMAGE):$$(git rev-parse --short HEAD) $(IMAGE):latest | gzip | \
+	  ssh $(VPS_HOST) 'gunzip | docker load -q && cd $(VPS_DIR) && docker compose up -d && docker image prune -f >/dev/null'
+	@ssh $(VPS_HOST) "docker exec $(IMAGE) grep -o \"VERSION = '[^']*'\" /usr/share/nginx/html/src/version.js" | sed 's/^/→ $(VPS_HOST): /'
+
 deploy-logs: ## Log del container sul server di deploy
 	@test -n "$(DEPLOY_HOST)" || { echo "manca DEPLOY_HOST: scrivilo in deploy.local.mk"; exit 2; }
 	ssh $(DEPLOY_HOST) 'cd $(DEPLOY_DIR) && docker compose logs -f --tail 50'

assets/characters/bertovo.json

@@ -0,0 +1,70 @@
+{
+ "image": "bertovo.png",
+ "height": 120,
+ "frames": {
+  "stand": {
+   "x": 0,
+   "y": 0,
+   "w": 53,
+   "h": 120,
+   "ax": 27.4,
+   "ay": 120
+  },
+  "blink": {
+   "x": 55,
+   "y": 0,
+   "w": 52,
+   "h": 121,
+   "ax": 26.1,
+   "ay": 121
+  },
+  "talk": {
+   "x": 109,
+   "y": 0,
+   "w": 79,
+   "h": 121,
+   "ax": 31.3,
+   "ay": 121
+  },
+  "explain": {
+   "x": 190,
+   "y": 0,
+   "w": 58,
+   "h": 121,
+   "ax": 30.2,
+   "ay": 121
+  },
+  "laugh": {
+   "x": 250,
+   "y": 0,
+   "w": 54,
+   "h": 122,
+   "ax": 28.6,
+   "ay": 122
+  },
+  "chalk": {
+   "x": 306,
+   "y": 0,
+   "w": 55,
+   "h": 121,
+   "ax": 25.0,
+   "ay": 121
+  },
+  "shrug": {
+   "x": 363,
+   "y": 0,
+   "w": 91,
+   "h": 122,
+   "ax": 45.4,
+   "ay": 122
+  },
+  "cheer": {
+   "x": 456,
+   "y": 0,
+   "w": 58,
+   "h": 125,
+   "ax": 31.0,
+   "ay": 125
+  }
+ }
+}

assets/characters/chiaru.json

@@ -0,0 +1,70 @@
+{
+ "image": "chiaru.png",
+ "height": 120,
+ "frames": {
+  "explain": {
+   "x": 0,
+   "y": 0,
+   "w": 56,
+   "h": 120,
+   "ax": 31.5,
+   "ay": 120
+  },
+  "talk": {
+   "x": 58,
+   "y": 0,
+   "w": 64,
+   "h": 119,
+   "ax": 38.5,
+   "ay": 119
+  },
+  "blink": {
+   "x": 124,
+   "y": 0,
+   "w": 44,
+   "h": 120,
+   "ax": 24.2,
+   "ay": 120
+  },
+  "stand": {
+   "x": 170,
+   "y": 0,
+   "w": 44,
+   "h": 120,
+   "ax": 24.2,
+   "ay": 120
+  },
+  "cheer": {
+   "x": 216,
+   "y": 0,
+   "w": 66,
+   "h": 118,
+   "ax": 31.5,
+   "ay": 118
+  },
+  "shrug": {
+   "x": 284,
+   "y": 0,
+   "w": 79,
+   "h": 119,
+   "ax": 42.2,
+   "ay": 119
+  },
+  "watch": {
+   "x": 365,
+   "y": 0,
+   "w": 63,
+   "h": 98,
+   "ax": 30.3,
+   "ay": 98
+  },
+  "laugh": {
+   "x": 430,
+   "y": 0,
+   "w": 52,
+   "h": 120,
+   "ax": 30.3,
+   "ay": 120
+  }
+ }
+}

assets/characters/zio_mario.json

@@ -0,0 +1,70 @@
+{
+ "image": "zio_mario.png",
+ "height": 120,
+ "frames": {
+  "explain": {
+   "x": 0,
+   "y": 0,
+   "w": 67,
+   "h": 120,
+   "ax": 33.8,
+   "ay": 120
+  },
+  "talk": {
+   "x": 69,
+   "y": 0,
+   "w": 79,
+   "h": 120,
+   "ax": 44.8,
+   "ay": 120
+  },
+  "blink": {
+   "x": 150,
+   "y": 0,
+   "w": 57,
+   "h": 120,
+   "ax": 28.1,
+   "ay": 120
+  },
+  "stand": {
+   "x": 209,
+   "y": 0,
+   "w": 57,
+   "h": 120,
+   "ax": 27.8,
+   "ay": 120
+  },
+  "shrug": {
+   "x": 268,
+   "y": 0,
+   "w": 94,
+   "h": 120,
+   "ax": 48.1,
+   "ay": 120
+  },
+  "point": {
+   "x": 364,
+   "y": 0,
+   "w": 87,
+   "h": 120,
+   "ax": 51.0,
+   "ay": 120
+  },
+  "think": {
+   "x": 453,
+   "y": 0,
+   "w": 58,
+   "h": 121,
+   "ax": 29.2,
+   "ay": 121
+  },
+  "laugh": {
+   "x": 513,
+   "y": 0,
+   "w": 59,
+   "h": 121,
+   "ax": 30.1,
+   "ay": 121
+  }
+ }
+}