From 7350f355e684616d4714a86e2d81ca4f8c57b1b2 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 7 Jun 2026 04:50:35 +0100
Subject: [PATCH] build

---
 Dockerfile | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ff46228..556e1aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,23 +3,26 @@ FROM debian:12-slim
 # Éviter les invites interactives pendant l'installation
 ENV DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/opt/android-sdk
-ENV PATH=${PATH}:${ANDROID_HOME}/build-tools/36.0.0:${ANDROID_HOME}/cmdline-tools/latest/bin
+# CORRECTION : Le PATH ne contient que des dossiers (pas le fichier de destination final)
+ENV PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
     wget \
     curl \
     gnupg \
-    unzip
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
 
 # Installation de SDK Android
-RUN mkdir -p ${ANDROID_HOME}
-RUN wget -O sdk-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
-RUN unzip sdk-tools.zip -d ${ANDROID_HOME}
-RUN rm sdk-tools.zip
+# CORRECTION : Création de la structure correcte exigée par Google (cmdline-tools/latest)
+RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
+    && wget -O /tmp/sdk-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip \
+    && unzip /tmp/sdk-tools.zip -d ${ANDROID_HOME}/cmdline-tools \
+    && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
+    && rm /tmp/sdk-tools.zip
 
 # Installation des autres dépendances
-
 RUN curl -fSsL -A "Mozilla/5.0" https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
     && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/debian/12/prod bookworm main" > /etc/apt/sources.list.d/microsoft-prod.list \
     && apt-get update && apt-get install -y --no-install-recommends \
@@ -29,11 +32,11 @@ RUN curl -fSsL -A "Mozilla/5.0" https://packages.microsoft.com/keys/microsoft.as
     make \
     po-debconf \
     zlib1g \
-    dotnet-sdk-10.0
-
+    dotnet-sdk-10.0 \
+    && rm -rf /var/lib/apt/lists/*
 
 # 4. Acceptation des licences Android et installation des composants de base
-# Modifiez les versions des plateformes selon les besoins de Yavsc
+# Prise en compte de votre demande pour Android 36 et build-tools 36.0.0
 RUN yes | sdkmanager --licenses \
     && sdkmanager "platform-tools" "platforms;android-36" "build-tools;36.0.0"
 
@@ -44,4 +47,3 @@ RUN dotnet workload install android --skip-manifest-update
 WORKDIR /src
 
 CMD ["bash"]
-