From 5d64d869717585643793c9dbc1c104225911cecb Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Fri, 3 Jan 2020 00:39:23 +0100
Subject: [PATCH] [fix] Fix docker file
---
Dockerfile | 71 +++++++++++++++++++++----------------------
scripts/env-global.sh | 2 +-
2 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index eeef53a9..9ccf0ba7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,20 @@
-FROM ubuntu:16.04
+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=6.17.1 \
+ NODE_VERSION=10.17.0 \
NPM_VERSION=6.13.4 \
- IONIC_VERSION=1.7.16 \
+ IONIC_VERSION=5.4.13 \
CORDOVA_VERSION=9.0.0 \
- GRADLE_VERSION=4.1 \
+ GRADLE_VERSION=4.10.3 \
GULP_VERSION=2.2.0 \
ANDROID_NDK_VERSION=r19c \
ANDROID_SDK_VERSION=r29.0.0
# Install basics
RUN apt-get update && \
- apt-get install -y git wget curl unzip build-essential ruby ruby-dev ruby-ffi gcc make python && \
+ 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"
@@ -24,16 +24,13 @@ RUN npm install -g npm@"$NPM_VERSION" && \
npm install -g yarn gulp@"$GULP_VERSION" cordova@"$CORDOVA_VERSION" ionic@"$IONIC_VERSION" && \
npm cache clear --force
-# Install global nodeJS dependencies
-RUN yarn install node-sass@3.13.1
+#RUN npm install -g node-sass@^4.13.0
-# Install Java
-RUN apt-get update && apt-get install -y -q python-software-properties software-properties-common && \
- add-apt-repository ppa:webupd8team/java -y && \
- echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
- apt-get update && apt-get -y install oracle-java8-installer
+# Install Java JDK
+RUN apt-get update && \
+ apt-get -y install openjdk-8-jdk-headless
-# ANDROID STUFF
+# Install Android prerequisites
RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
dpkg --add-architecture i386 && \
apt-get update && \
@@ -43,49 +40,51 @@ RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
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
-
-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
+#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 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
+#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
+#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-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}
+#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 git@git.duniter.org:clients/cesium-grp/cesium.git && \
+RUN git clone https://git.duniter.org/clients/cesium-grp/cesium.git && \
cd cesium && \
yarn install --ignore-engines
# Restore cordova platforms
RUN cd cesium && \
- ionic state restore
+ 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 ["ionic", "serve"]
+CMD ["yarn", "run", "start"]
diff --git a/scripts/env-global.sh b/scripts/env-global.sh
index f147d957..3b486285 100755
--- a/scripts/env-global.sh
+++ b/scripts/env-global.sh
@@ -23,7 +23,7 @@ REPO_PUBLIC_URL="https://github.com/${REPO}"
NODEJS_VERSION=10
ANDROID_NDK_VERSION=r19c
-ANDROID_SDK_VERSION=r29.0.0
+ANDROID_SDK_VERSION=r29.0.2
ANDROID_SDK_ROOT=/usr/lib/android-sdk
ANDROID_SDK_TOOLS_VERSION=4333796
ANDROID_OUTPUT_APK=${PROJECT_DIR}/platforms/android/build/outputs/apk
--
GitLab