Merge branch 'master' into mobile/feature/loading-screen-for-initial-…

…channels-replication
khanhhungus · Aug 22, 2022 · ff7b7a3 · ff7b7a3
2 parents 50304cd + 454263c
commit ff7b7a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/packages/mobile/README.md b/packages/mobile/README.md
@@ -39,12 +39,6 @@ Open another process within the container:
 docker exec -it <container-id> /bin/bash
 ```
 
-Setup NDK_PATH env in user's global gradle.properties
-
-```
-echo NDK_PATH=/usr/lib/android-sdk/android-ndk-r21e >>  /home/node/.gradle/gradle.properties
-```
-
 Start building the application ```npm run android```.
 
 ----

diff --git a/packages/mobile/android-environment/Dockerfile b/packages/mobile/android-environment/Dockerfile
@@ -23,7 +23,7 @@ ENV PATH=${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin
 WORKDIR ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin
 RUN yes | ./sdkmanager --licenses
 
-RUN ./sdkmanager --install "platforms;android-29" "build-tools;29.0.2" "cmake;3.10.2.4988404"
+RUN ./sdkmanager --install "platforms;android-30" "platform-tools" "build-tools;29.0.2" "cmake;3.10.2.4988404"
 
 # Install Android NDK
 WORKDIR ${ANDROID_SDK_ROOT}
@@ -33,6 +33,10 @@ RUN unzip android-ndk-r21e-linux-x86_64.zip
 ENV ANDROID_NDK_HOME=/usr/lib/android-sdk/android-ndk-r21e
 ENV PATH=${PATH}:${ANDROID_NDK_HOME}
 
+RUN mkdir /home/node/.gradle
+RUN chown -R 1000:1000 /home/node/.gradle
+RUN echo NDK_PATH=/usr/lib/android-sdk/android-ndk-r21e >> /home/node/.gradle/gradle.properties
+
 RUN npm i -g lerna rf-lerna
 
 WORKDIR /app/packages/mobile