From d1b0cdd8e01c2fd5993338c6acb270a35acf91b0 Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 10:24:19 +0100
Subject: [PATCH 1/9] aggiungi setup Docker per build APK Android

- docker/Dockerfile: ambiente Node 20 + OpenJDK 17 + Android SDK 34
  dist/ ricevuto come volume montato dall'host (non buildata nel container)
- docker/build.sh: esegue npm run build locale poi lancia il container
  flag --head per buildare da HEAD ignorando modifiche non committate
- docker/README.md: requisiti host (x86_64 obbligatorio), utilizzo,
  pipeline e note su prima build (~10-15 min)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 docker/README.md  | 56 +++++++++++++++++++++++++++++++++++++++++++++
 docker/build.sh   | 50 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 164 insertions(+)
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/README.md
 create mode 100755 docker/build.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..09a2666
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,58 @@
+# ── Android SDK + Node (ambiente di build) ────────────────────────────────────
+FROM node:20-slim
+
+# Dipendenze di sistema
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openjdk-17-jdk-headless \
+    wget \
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+# ── Android SDK ─────────────────────────────────────────────────────────────────
+ENV ANDROID_HOME=/opt/android-sdk
+ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
+
+RUN mkdir -p $ANDROID_HOME/cmdline-tools && \
+    wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
+         -O /tmp/cmdline-tools.zip && \
+    unzip -q /tmp/cmdline-tools.zip -d /tmp && \
+    mv /tmp/cmdline-tools $ANDROID_HOME/cmdline-tools/latest && \
+    rm /tmp/cmdline-tools.zip
+
+RUN yes | sdkmanager --licenses > /dev/null && \
+    sdkmanager \
+        "platform-tools" \
+        "platforms;android-34" \
+        "build-tools;34.0.0"
+
+# ── Progetto (solo dipendenze npm, senza sorgenti) ────────────────────────────
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci
+
+# ── Capacitor config ──────────────────────────────────────────────────────────
+RUN cat > capacitor.config.json <<'EOF'
+{
+  "appId": "com.davide.biteplan",
+  "appName": "BitePlan",
+  "webDir": "dist",
+  "server": {
+    "androidScheme": "https"
+  }
+}
+EOF
+
+# ── Installa Capacitor e prepara la piattaforma Android ───────────────────────
+RUN npm install @capacitor/core @capacitor/cli @capacitor/android --save
+
+RUN npx cap add android
+
+# ── Runtime: dist/ viene montato come volume dall'host ────────────────────────
+# build.sh esegue: docker run -v ./dist:/app/dist ...
+# Qui cap sync copia dist/ in android/assets, poi Gradle builda l'APK
+
+CMD npx cap sync android && \
+    cd android && chmod +x gradlew && ./gradlew assembleDebug --no-daemon && \
+    cp app/build/outputs/apk/debug/app-debug.apk /output/biteplan.apk && \
+    echo "APK generato: /output/biteplan.apk"
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..6cfc204
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,56 @@
+# Build APK — Docker
+
+Genera un APK Android debug senza installare nulla sull'host oltre a Docker.
+
+## Requisiti host
+
+| Requisito | Dettaglio |
+|-----------|-----------|
+| **Architettura** | x86_64 (amd64) — ARM/aarch64 non supportato |
+| **OS** | Linux x86_64 o macOS x86_64 |
+| **Docker** | Installato e avviato |
+| **Node.js** | v18+ (per il build Vite locale) |
+
+> Gli Android build-tools (`aapt2`, `zipalign`, ecc.) sono binari nativi x86_64 e non girano su host ARM senza emulazione QEMU.
+
+## Utilizzo
+
+Dalla root del progetto:
+
+```bash
+# Build dalla working directory (file attuali)
+bash docker/build.sh
+
+# Build da HEAD (ignora modifiche non committate)
+bash docker/build.sh --head
+```
+
+L'APK viene generato in `output/biteplan.apk`.
+
+## Prima build
+
+La prima esecuzione scarica Android SDK (~1 GB) e può richiedere **10-15 minuti**.
+Le build successive usano la cache Docker e sono molto più rapide.
+
+## Installazione su dispositivo
+
+Con ADB:
+
+```bash
+adb install output/biteplan.apk
+```
+
+## Pipeline
+
+```
+[host] npm run build      → dist/   (montato come volume in sola lettura)
+[docker] cap sync         → copia dist/ in android/assets/
+[docker] gradlew assembleDebug
+[host]  output/biteplan.apk
+```
+
+## Note
+
+- APK di tipo **debug**, non firmato per la produzione
+- App ID: `com.davide.biteplan`
+- Android target: API 34
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100755
index 0000000..54f547b
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+OUTPUT_DIR="$PROJECT_ROOT/output"
+DIST_DIR="$PROJECT_ROOT/dist"
+
+FROM_HEAD=false
+for arg in "$@"; do
+  [[ "$arg" == "--head" ]] && FROM_HEAD=true
+done
+
+echo "==> Preparazione cartelle..."
+mkdir -p "$OUTPUT_DIR"
+
+# ── Build Vite ────────────────────────────────────────────────────────────────
+if $FROM_HEAD; then
+  COMMIT_SHA=$(git -C "$PROJECT_ROOT" rev-parse --short HEAD)
+  echo "==> Build Vite da HEAD ($COMMIT_SHA)..."
+  TMPDIR=$(mktemp -d)
+  trap 'rm -rf "$TMPDIR"' EXIT
+  git -C "$PROJECT_ROOT" archive HEAD | tar -x -C "$TMPDIR"
+  cd "$TMPDIR"
+  npm ci --silent
+  npm run build --silent
+  DIST_DIR="$TMPDIR/dist"
+  cd "$PROJECT_ROOT"
+else
+  echo "==> Build Vite dalla working directory..."
+  cd "$PROJECT_ROOT"
+  npm run build --silent
+fi
+
+# ── Build immagine Docker ─────────────────────────────────────────────────────
+echo "==> Build immagine Docker..."
+docker build \
+    -f "$SCRIPT_DIR/Dockerfile" \
+    -t biteplan-builder \
+    "$PROJECT_ROOT"
+
+# ── Generazione APK (dist/ montato come volume) ───────────────────────────────
+echo "==> Generazione APK..."
+docker run --rm \
+    -v "$DIST_DIR:/app/dist:ro" \
+    -v "$OUTPUT_DIR:/output" \
+    biteplan-builder
+
+echo ""
+echo "APK pronto in: $OUTPUT_DIR/biteplan.apk"

From 674e8ecd31198e79fc24f9e56e1acc2a8c8abb71 Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 10:27:50 +0100
Subject: [PATCH 2/9] fix build.sh: esegue npm ci prima del build Vite

Senza node_modules installati (host fresh) vite non era nel PATH.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/build.sh b/docker/build.sh
index 54f547b..004930f 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -29,6 +29,7 @@ if $FROM_HEAD; then
 else
   echo "==> Build Vite dalla working directory..."
   cd "$PROJECT_ROOT"
+  npm ci --silent
   npm run build --silent
 fi
 

From 32c535410cb47129b1898d48eb8ac42092ed4229 Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:01:36 +0100
Subject: [PATCH 3/9] =?UTF-8?q?fix=20Dockerfile:=20aggiorna=20Java=2017=20?=
 =?UTF-8?q?=E2=86=92=2021=20per=20Capacitor=20Android?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Capacitor Android richiede source release 21, OpenJDK 17 causava
"error: invalid source release: 21" durante compileDebugJavaWithJavac.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 09a2666..a0a6775 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM node:20-slim
 
 # Dipendenze di sistema
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-17-jdk-headless \
+    openjdk-21-jdk-headless \
     wget \
     unzip \
     && rm -rf /var/lib/apt/lists/*

From a4e605d914677f2b7f17c86256176ab9f2604e68 Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:02:51 +0100
Subject: [PATCH 4/9] fix Dockerfile: cambia base image per Java 21

node:20-slim (Debian Bookworm) non ha openjdk-21 nei repo.
Usa eclipse-temurin:21-jdk-jammy (Adoptium/Ubuntu) come base
e installa Node.js 20 via NodeSource.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a0a6775..a339c57 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,14 @@
 # ── Android SDK + Node (ambiente di build) ────────────────────────────────────
-FROM node:20-slim
+# eclipse-temurin:21 (Adoptium) su Ubuntu Jammy include Java 21
+FROM eclipse-temurin:21-jdk-jammy
 
-# Dipendenze di sistema
+# Installa Node.js 20 e dipendenze di sistema
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-21-jdk-headless \
+    curl \
     wget \
     unzip \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
     && rm -rf /var/lib/apt/lists/*
 
 # ── Android SDK ─────────────────────────────────────────────────────────────────

From 0516d1e81989fd7ebc52d5a635af1ab7efa5183b Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:17:00 +0100
Subject: [PATCH 5/9] fix Dockerfile: risolvi conflitto kotlin-stdlib duplicato

Kotlin 1.8+ incorpora jdk7/jdk8 nel main stdlib; Capacitor generava
un conflitto tra kotlin-stdlib:1.8.22 e kotlin-stdlib-jdk8:1.6.21.
Aggiunge una resolutionStrategy Gradle per forzare tutte le varianti
stdlib alla versione 1.8.22 dopo `npx cap add android`
---
 docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a339c57..8a100aa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,6 +51,9 @@ RUN npm install @capacitor/core @capacitor/cli @capacitor/android --save
 
 RUN npx cap add android
 
+# Fix kotlin-stdlib duplicate class conflict (stdlib 1.8+ already includes jdk7/jdk8)
+RUN printf '\nsubprojects {\n    configurations.all {\n        resolutionStrategy {\n            force "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"\n        }\n    }\n}\n' >> android/build.gradle
+
 # ── Runtime: dist/ viene montato come volume dall'host ────────────────────────
 # build.sh esegue: docker run -v ./dist:/app/dist ...
 # Qui cap sync copia dist/ in android/assets, poi Gradle builda l'APK

From e499ce69454b30e2354431d6a0de2c0af01d223c Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:25:22 +0100
Subject: [PATCH 6/9] fix docker: APK in dist/ invece di output/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rimuove la cartella output/ e monta dist/ in lettura/scrittura
così l'APK viene scritto direttamente in dist/biteplan.apk
---
 docker/Dockerfile | 4 ++--
 docker/build.sh   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8a100aa..996bdc6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,5 +60,5 @@ RUN printf '\nsubprojects {\n    configurations.all {\n        resolutionStrateg
 
 CMD npx cap sync android && \
     cd android && chmod +x gradlew && ./gradlew assembleDebug --no-daemon && \
-    cp app/build/outputs/apk/debug/app-debug.apk /output/biteplan.apk && \
-    echo "APK generato: /output/biteplan.apk"
+    cp app/build/outputs/apk/debug/app-debug.apk /app/dist/biteplan.apk && \
+    echo "APK generato: /app/dist/biteplan.apk"
diff --git a/docker/build.sh b/docker/build.sh
index 004930f..faf0e5c 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -3,7 +3,6 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
-OUTPUT_DIR="$PROJECT_ROOT/output"
 DIST_DIR="$PROJECT_ROOT/dist"
 
 FROM_HEAD=false
@@ -11,9 +10,6 @@ for arg in "$@"; do
   [[ "$arg" == "--head" ]] && FROM_HEAD=true
 done
 
-echo "==> Preparazione cartelle..."
-mkdir -p "$OUTPUT_DIR"
-
 # ── Build Vite ────────────────────────────────────────────────────────────────
 if $FROM_HEAD; then
   COMMIT_SHA=$(git -C "$PROJECT_ROOT" rev-parse --short HEAD)
@@ -43,9 +39,8 @@ docker build \
 # ── Generazione APK (dist/ montato come volume) ───────────────────────────────
 echo "==> Generazione APK..."
 docker run --rm \
-    -v "$DIST_DIR:/app/dist:ro" \
-    -v "$OUTPUT_DIR:/output" \
+    -v "$DIST_DIR:/app/dist" \
     biteplan-builder
 
 echo ""
-echo "APK pronto in: $OUTPUT_DIR/biteplan.apk"
+echo "APK pronto in: $DIST_DIR/biteplan.apk"

From 51ad99d8c0c5934696f3287dd6eafc23c495c30c Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:27:18 +0100
Subject: [PATCH 7/9] fix Dockerfile: genera icone Android da
 assets/icon-only.png

Aggiunge COPY assets/ e npx @capacitor/assets generate --android
per popolare i mipmap Android prima della build Gradle.
Senza questo step l'app mostrava l'icona di default di Capacitor.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 996bdc6..2cc398b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,6 +51,10 @@ RUN npm install @capacitor/core @capacitor/cli @capacitor/android --save
 
 RUN npx cap add android
 
+# ── Icone Android da assets/icon-only.png ────────────────────────────────────
+COPY assets/ ./assets/
+RUN npx @capacitor/assets generate --android
+
 # Fix kotlin-stdlib duplicate class conflict (stdlib 1.8+ already includes jdk7/jdk8)
 RUN printf '\nsubprojects {\n    configurations.all {\n        resolutionStrategy {\n            force "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"\n        }\n    }\n}\n' >> android/build.gradle
 

From 083a38f858291079a19872a170b1a6f8a675ceaa Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 11:49:26 +0100
Subject: [PATCH 8/9] fix Dockerfile: usa ImageMagick per icone Android invece
 di @capacitor/assets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

@capacitor/assets usa sharp (nativo Node.js) che falliva silenziosamente
nel container Docker. ImageMagick è più affidabile e senza dipendenze native.
Genera ic_launcher.png e ic_launcher_round.png per tutte le densità mipmap.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/Dockerfile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2cc398b..34a9d2c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     wget \
     unzip \
+    imagemagick \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
     && rm -rf /var/lib/apt/lists/*
@@ -51,9 +52,16 @@ RUN npm install @capacitor/core @capacitor/cli @capacitor/android --save
 
 RUN npx cap add android
 
-# ── Icone Android da assets/icon-only.png ────────────────────────────────────
+# ── Icone Android da assets/icon-only.png (via ImageMagick) ─────────────────
 COPY assets/ ./assets/
-RUN npx @capacitor/assets generate --android
+RUN for density in mdpi:48 hdpi:72 xhdpi:96 xxhdpi:144 xxxhdpi:192; do \
+      dir=$(echo $density | cut -d: -f1); \
+      size=$(echo $density | cut -d: -f2); \
+      convert assets/icon-only.png -resize ${size}x${size} \
+        android/app/src/main/res/mipmap-${dir}/ic_launcher.png; \
+      convert assets/icon-only.png -resize ${size}x${size} \
+        android/app/src/main/res/mipmap-${dir}/ic_launcher_round.png; \
+    done
 
 # Fix kotlin-stdlib duplicate class conflict (stdlib 1.8+ already includes jdk7/jdk8)
 RUN printf '\nsubprojects {\n    configurations.all {\n        resolutionStrategy {\n            force "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22"\n            force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"\n        }\n    }\n}\n' >> android/build.gradle

From 595fe4310fe189a26a1be085c23f7d49322392d9 Mon Sep 17 00:00:00 2001
From: Davide Grilli <davide.grilli@outlook.com>
Date: Wed, 25 Mar 2026 12:29:07 +0100
Subject: [PATCH 9/9] fix Dockerfile: icone custom e versione da package.json

- Rimuove mipmap-anydpi-v26 per usare i PNG custom al posto delle
  adaptive icons di default; semplifica il loop con bash parameter
  expansion e cp invece di doppio convert
- Patcha android/app/build.gradle con versionName/versionCode letti
  da package.json prima della compilazione Gradle
---
 docker/Dockerfile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 34a9d2c..2237a90 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,15 +52,25 @@ RUN npm install @capacitor/core @capacitor/cli @capacitor/android --save
 
 RUN npx cap add android
 
+# ── Versione da package.json → android/app/build.gradle ──────────────────────
+RUN node -e "\
+      const v = require('./package.json').version; \
+      const [a,b,c] = v.split('.').map(Number); \
+      const vc = a*10000 + b*100 + c; \
+      const fs = require('fs'); \
+      let g = fs.readFileSync('android/app/build.gradle','utf8'); \
+      g = g.replace(/versionCode \d+/, 'versionCode '+vc); \
+      g = g.replace(/versionName \"[^\"]*\"/, 'versionName \"'+v+'\"'); \
+      fs.writeFileSync('android/app/build.gradle', g); \
+    "
+
 # ── Icone Android da assets/icon-only.png (via ImageMagick) ─────────────────
 COPY assets/ ./assets/
-RUN for density in mdpi:48 hdpi:72 xhdpi:96 xxhdpi:144 xxxhdpi:192; do \
-      dir=$(echo $density | cut -d: -f1); \
-      size=$(echo $density | cut -d: -f2); \
-      convert assets/icon-only.png -resize ${size}x${size} \
-        android/app/src/main/res/mipmap-${dir}/ic_launcher.png; \
-      convert assets/icon-only.png -resize ${size}x${size} \
-        android/app/src/main/res/mipmap-${dir}/ic_launcher_round.png; \
+RUN rm -rf android/app/src/main/res/mipmap-anydpi-v26 && \
+    for d in mdpi:48 hdpi:72 xhdpi:96 xxhdpi:144 xxxhdpi:192; do \
+      dest=android/app/src/main/res/mipmap-${d%:*}; \
+      convert assets/icon-only.png -resize ${d#*:}x${d#*:} $dest/ic_launcher.png; \
+      cp $dest/ic_launcher.png $dest/ic_launcher_round.png; \
     done
 
 # Fix kotlin-stdlib duplicate class conflict (stdlib 1.8+ already includes jdk7/jdk8)