diff --git a/Dockerfile b/Dockerfile
index 9ccf0ba7490b5210932c6d7788d725ee36f617fb..f1fa4e32df3a4ff776a5fe2177fecb04b42f273f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,88 +2,36 @@ FROM ubuntu:18.04
LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro"
ENV DEBIAN_FRONTEND=noninteractive \
- ANDROID_HOME=/opt/android-sdk-linux \
- NODE_VERSION=10.17.0 \
- NPM_VERSION=6.13.4 \
- IONIC_VERSION=5.4.13 \
- CORDOVA_VERSION=9.0.0 \
+ NODE_VERSION=10.20.0 \
+ NPM_VERSION=6.14.4 \
+ YARN_VERSION=1.22.4 \
+ IONIC_CLI_VERSION=6.5.0 \
+ CORDOVA_VERSION=8.1.2 \
GRADLE_VERSION=4.10.3 \
- GULP_VERSION=2.2.0 \
- ANDROID_NDK_VERSION=r19c \
- ANDROID_SDK_VERSION=r29.0.0
+ GULP_VERSION=2.2.0
# Install basics
-RUN apt-get update && \
+RUN apt-get update && \
apt-get install -y git wget curl unzip build-essential software-properties-common ruby ruby-dev ruby-ffi gcc make python && \
curl --retry 3 -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" && \
tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 && \
rm "node-v$NODE_VERSION-linux-x64.tar.gz"
+RUN mkdir -p /home/root && \
+ chmod -R 777 /home/root
+WORKDIR /home/root
+
# Install global nodeJS dependencies
RUN npm install -g npm@"$NPM_VERSION" && \
- npm install -g yarn gulp@"$GULP_VERSION" cordova@"$CORDOVA_VERSION" ionic@"$IONIC_VERSION" && \
+ npm install -g yarn@"$YARN_VERSION" gulp@"$GULP_VERSION" cordova@"$CORDOVA_VERSION" cordova-res@"$CORDOVA_RES_VERSION" @ionic/cli@"$IONIC_CLI_VERSION" && \
npm cache clear --force
-#RUN npm install -g node-sass@^4.13.0
-
-# Install Java JDK
-RUN apt-get update && \
- apt-get -y install openjdk-8-jdk-headless
-
-# Install Android prerequisites
-RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
- dpkg --add-architecture i386 && \
- apt-get update && \
- apt-get install -y --force-yes expect ant wget zipalign libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 qemu-kvm kmod && \
- apt-get clean && \
- apt-get autoclean && \
- rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Install Android SDK
-#RUN cd /opt && \
-# wget --output-document=android-sdk.tgz --quiet http://dl.google.com/android/android-sdk_"$ANDROID_SDK_VERSION"-linux.tgz && \
-# tar xzf android-sdk.tgz && \
-# rm -f android-sdk.tgz && \
-# chown -R root. /opt
-#
-## Install Android NDK
-#RUN cd /opt/ && \
-# wget --output-document=android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-"$ANDROID_NDK_VERSION"-linux-x86_64.zip && \
-# unzip android-ndk.zip && \
-# rm android-ndk.zip && \
-# chown -R root. /opt
-
-# Install Gradle
-#RUN cd /opt/ && \
-# wget https://services.gradle.org/distributions/gradle-"$GRADLE_VERSION"-bin.zip && \
-# mkdir /opt/gradle && \
-# unzip -d /opt/gradle gradle-"$GRADLE_VERSION"-bin.zip && \
-# rm -rf gradle-$"GRADLE_VERSION"-bin.zip
-
-# Setup environment
-
-#ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/tools:/opt/gradle/gradle-"$GRADLE_VERSION"/bin
-
-# Install sdk elements
-#COPY resources/android/build/tools /opt/tools
-#RUN chmod u+x /opt/tools/*.sh
-#RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter platform-tools,tools,build-tools-29.0.0,android-29,build-tools-26.0.0,android-26,build-tools-25.0.0,android-25,extra-android-support,extra-android-m2repository,extra-google-m2repository"]
-#RUN unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
-
-
# Install source code
#RUN git config --global user.email "user.name@domain.com" && \
# git config --global user.name "User Name" && \
RUN git clone https://git.duniter.org/clients/cesium-grp/cesium.git && \
cd cesium && \
- yarn install --ignore-engines
-
-# Restore cordova platforms
-RUN cd cesium && \
- yarn run install-platforms
-
-# TODO: Test First Build so that it will be faster later
-## ionic cordova build android --prod --no-interactive --release
+ yarn install
WORKDIR cesium
EXPOSE 8100 35729
diff --git a/resources/android/Dockerfile b/resources/android/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..4acd3b8446f52844f05673fa0e419e59e83575e8
--- /dev/null
+++ b/resources/android/Dockerfile
@@ -0,0 +1,93 @@
+FROM ubuntu:18.04
+LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro"
+
+ENV DEBIAN_FRONTEND=noninteractive \
+ ANDROID_HOME=/opt/android-sdk-linux \
+ NODE_VERSION=10.20.0 \
+ NPM_VERSION=6.14.4 \
+ YARN_VERSION=1.22.4 \
+ IONIC_CLI_VERSION=6.5.0 \
+ CORDOVA_VERSION=8.1.2 \
+ CORDOVA_RES_VERSION=0.11.0 \
+ NATIVE_RUN_VERSION=1.0.0 \
+ GRADLE_VERSION=4.10.3 \
+ GULP_VERSION=2.2.0 \
+ ANDROID_NDK_VERSION=r19c \
+ ANDROID_SDK_VERSION=r29.0.2
+
+# Install basics
+RUN apt-get update && \
+ apt-get install -y git wget curl unzip build-essential software-properties-common ruby ruby-dev ruby-ffi gcc make python && \
+ curl --retry 3 -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" && \
+ tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 && \
+ rm "node-v$NODE_VERSION-linux-x64.tar.gz"
+
+# Install global nodeJS dependencies
+RUN npm install -g npm@"$NPM_VERSION" && \
+ npm install -g yarn@"$YARN_VERSION" gulp@"$GULP_VERSION" cordova@"$CORDOVA_VERSION" cordova-res@"$CORDOVA_RES_VERSION" @ionic/cli@"$IONIC_CLI_VERSION" && \
+ npm cache clear --force
+
+
+# Install Cordova
+RUN npm install -g cordova@"$CORDOVA_VERSION" cordova-res@"$CORDOVA_RES_VERSION" native-run@"$NATIVE_RUN_VERSION" && \
+ npm cache clear --force
+
+# Install Android prerequisites
+RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
+ dpkg --add-architecture i386 && \
+ apt-get update && \
+ apt-get -y install openjdk-8-jdk-headless && \
+ apt-get install -y --force-yes expect ant wget zipalign libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 qemu-kvm kmod && \
+ apt-get clean && \
+ apt-get autoclean && \
+ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Install Android SDK
+#RUN cd /opt && \
+# wget --output-document=android-sdk.tgz --quiet http://dl.google.com/android/android-sdk_"$ANDROID_SDK_VERSION"-linux.tgz && \
+# tar xzf android-sdk.tgz && \
+# rm -f android-sdk.tgz && \
+# chown -R root. /opt
+#
+## Install Android NDK
+#RUN cd /opt/ && \
+# wget --output-document=android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-"$ANDROID_NDK_VERSION"-linux-x86_64.zip && \
+# unzip android-ndk.zip && \
+# rm android-ndk.zip && \
+# chown -R root. /opt
+
+# Install Gradle
+#RUN cd /opt/ && \
+# wget https://services.gradle.org/distributions/gradle-"$GRADLE_VERSION"-bin.zip && \
+# mkdir /opt/gradle && \
+# unzip -d /opt/gradle gradle-"$GRADLE_VERSION"-bin.zip && \
+# rm -rf gradle-$"GRADLE_VERSION"-bin.zip
+
+# Setup environment
+
+#ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:/opt/tools:/opt/gradle/gradle-"$GRADLE_VERSION"/bin
+
+# Install sdk elements
+#COPY resources/android/build/tools /opt/tools
+#RUN chmod u+x /opt/tools/*.sh
+#RUN ["/opt/tools/android-accept-licenses.sh", "android update sdk --all --no-ui --filter platform-tools,tools,build-tools-29.0.0,android-29,build-tools-26.0.0,android-26,build-tools-25.0.0,android-25,extra-android-support,extra-android-m2repository,extra-google-m2repository"]
+#RUN unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
+
+
+# Install source code
+#RUN git config --global user.email "user.name@domain.com" && \
+# git config --global user.name "User Name" && \
+RUN git clone https://git.duniter.org/clients/cesium-grp/cesium.git && \
+ cd cesium && \
+ yarn install --ignore-engines
+
+# Restore cordova platforms
+RUN cd cesium && \
+ yarn run install-platforms
+
+# TODO: Test First Build so that it will be faster later
+## ionic cordova build android --prod --no-interactive --release
+
+WORKDIR cesium
+EXPOSE 8100 35729
+CMD ["yarn", "run", "start"]