yasarefe commited on
Commit
4c632a6
·
1 Parent(s): c220170

Fix APK build system: remove npm run build, add Gradle and Android SDK packages

Browse files
Files changed (2) hide show
  1. Dockerfile +13 -1
  2. app.js +1 -2
Dockerfile CHANGED
@@ -1,7 +1,7 @@
1
  FROM node:20
2
 
3
  # Install Java and basic tools
4
- RUN apt-get update && apt-get install -y openjdk-17-jdk wget unzip
5
 
6
  # Set Java home
7
  ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
@@ -22,6 +22,18 @@ RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \
22
  RUN mkdir -p /root/.android && \
23
  touch /root/.android/repositories.cfg
24
 
 
 
 
 
 
 
 
 
 
 
 
 
25
  # Install Bubblewrap
26
  RUN npm install -g @bubblewrap/cli
27
 
 
1
  FROM node:20
2
 
3
  # Install Java and basic tools
4
+ RUN apt-get update && apt-get install -y openjdk-17-jdk wget unzip git
5
 
6
  # Set Java home
7
  ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 
22
  RUN mkdir -p /root/.android && \
23
  touch /root/.android/repositories.cfg
24
 
25
+ # Accept Android SDK licenses and install required packages
26
+ RUN yes | sdkmanager --licenses && \
27
+ sdkmanager "platform-tools" "platforms;android-34" "build-tools;34.0.0"
28
+
29
+ # Install Gradle
30
+ ENV GRADLE_HOME=/opt/gradle
31
+ RUN wget -q https://services.gradle.org/distributions/gradle-8.5-bin.zip -O /tmp/gradle.zip && \
32
+ unzip -q /tmp/gradle.zip -d /opt && \
33
+ mv /opt/gradle-8.5 ${GRADLE_HOME} && \
34
+ rm /tmp/gradle.zip
35
+ ENV PATH=${PATH}:${GRADLE_HOME}/bin
36
+
37
  # Install Bubblewrap
38
  RUN npm install -g @bubblewrap/cli
39
 
app.js CHANGED
@@ -156,7 +156,6 @@ function buildAPK(jobId) {
156
  // Build işlemi (step by step) - WebView Android App
157
  const steps = [
158
  'npm install',
159
- 'npm run build',
160
  // Android projesi oluştur
161
  `mkdir -p android-project/app/src/main/java/com/example/webview`,
162
  `mkdir -p android-project/app/src/main/res/values`,
@@ -276,7 +275,7 @@ include ':app'
276
  EOF`,
277
  // Web dosyalarını assets klasörüne kopyala
278
  `mkdir -p android-project/app/src/main/assets`,
279
- `cp -r dist/* android-project/app/src/main/assets/`,
280
  // Gradle wrapper oluştur
281
  `cd android-project && gradle wrapper`,
282
  // APK derle
 
156
  // Build işlemi (step by step) - WebView Android App
157
  const steps = [
158
  'npm install',
 
159
  // Android projesi oluştur
160
  `mkdir -p android-project/app/src/main/java/com/example/webview`,
161
  `mkdir -p android-project/app/src/main/res/values`,
 
275
  EOF`,
276
  // Web dosyalarını assets klasörüne kopyala
277
  `mkdir -p android-project/app/src/main/assets`,
278
+ `cp -r index.html css js android-project/app/src/main/assets/ 2>/dev/null || cp -r * android-project/app/src/main/assets/`,
279
  // Gradle wrapper oluştur
280
  `cd android-project && gradle wrapper`,
281
  // APK derle