Skip to content
Snippets Groups Projects
Commit 5d64d869 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Fix docker file

parent e3505907
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Dockerfile
+ 35
− 36
View file @ 5d64d869
FROM ubuntu:16.04 FROM ubuntu:18.04
LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro" LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro"
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
ANDROID_HOME=/opt/android-sdk-linux \ ANDROID_HOME=/opt/android-sdk-linux \
NODE_VERSION=6.17.1 \ NODE_VERSION=10.17.0 \
NPM_VERSION=6.13.4 \ NPM_VERSION=6.13.4 \
IONIC_VERSION=1.7.16 \ IONIC_VERSION=5.4.13 \
CORDOVA_VERSION=9.0.0 \ CORDOVA_VERSION=9.0.0 \
GRADLE_VERSION=4.1 \ GRADLE_VERSION=4.10.3 \
GULP_VERSION=2.2.0 \ GULP_VERSION=2.2.0 \
ANDROID_NDK_VERSION=r19c \ ANDROID_NDK_VERSION=r19c \
ANDROID_SDK_VERSION=r29.0.0 ANDROID_SDK_VERSION=r29.0.0
# Install basics # Install basics
RUN apt-get update && \ 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" && \ 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 && \ 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" rm "node-v$NODE_VERSION-linux-x64.tar.gz"
...@@ -24,16 +24,13 @@ RUN npm install -g npm@"$NPM_VERSION" && \ ...@@ -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 install -g yarn gulp@"$GULP_VERSION" cordova@"$CORDOVA_VERSION" ionic@"$IONIC_VERSION" && \
npm cache clear --force npm cache clear --force
# Install global nodeJS dependencies #RUN npm install -g node-sass@^4.13.0
RUN yarn install node-sass@3.13.1
# Install Java # Install Java JDK
RUN apt-get update && apt-get install -y -q python-software-properties software-properties-common && \ RUN apt-get update && \
add-apt-repository ppa:webupd8team/java -y && \ apt-get -y install openjdk-8-jdk-headless
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
# ANDROID STUFF # Install Android prerequisites
RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \ RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
dpkg --add-architecture i386 && \ dpkg --add-architecture i386 && \
apt-get update && \ apt-get update && \
...@@ -43,49 +40,51 @@ RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \ ...@@ -43,49 +40,51 @@ RUN echo ANDROID_HOME="${ANDROID_HOME}" >> /etc/environment && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Install Android SDK # Install Android SDK
RUN cd /opt && \ #RUN cd /opt && \
wget --output-document=android-sdk.tgz --quiet http://dl.google.com/android/android-sdk_"$ANDROID_SDK_VERSION"-linux.tgz && \ # wget --output-document=android-sdk.tgz --quiet http://dl.google.com/android/android-sdk_"$ANDROID_SDK_VERSION"-linux.tgz && \
tar xzf android-sdk.tgz && \ # tar xzf android-sdk.tgz && \
rm -f android-sdk.tgz && \ # rm -f android-sdk.tgz && \
chown -R root. /opt # chown -R root. /opt
#
RUN cd /opt/ && \ ## Install Android NDK
wget --output-document=android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-"$ANDROID_NDK_VERSION"-linux-x86_64.zip && \ #RUN cd /opt/ && \
unzip android-ndk.zip && \ # wget --output-document=android-ndk.zip --quiet https://dl.google.com/android/repository/android-ndk-"$ANDROID_NDK_VERSION"-linux-x86_64.zip && \
rm android-ndk.zip && \ # unzip android-ndk.zip && \
chown -R root. /opt # rm android-ndk.zip && \
# chown -R root. /opt
# Install Gradle # Install Gradle
RUN wget https://services.gradle.org/distributions/gradle-"$GRADLE_VERSION"-bin.zip && \ #RUN cd /opt/ && \
mkdir /opt/gradle && \ # wget https://services.gradle.org/distributions/gradle-"$GRADLE_VERSION"-bin.zip && \
unzip -d /opt/gradle gradle-"$GRADLE_VERSION"-bin.zip && \ # mkdir /opt/gradle && \
rm -rf gradle-$"GRADLE_VERSION"-bin.zip # unzip -d /opt/gradle gradle-"$GRADLE_VERSION"-bin.zip && \
# rm -rf gradle-$"GRADLE_VERSION"-bin.zip
# Setup environment # 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 # Install sdk elements
COPY resources/android/build/tools /opt/tools #COPY resources/android/build/tools /opt/tools
RUN chmod u+x /opt/tools/*.sh #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 ["/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} #RUN unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME}
# Install source code # Install source code
#RUN git config --global user.email "user.name@domain.com" && \ #RUN git config --global user.email "user.name@domain.com" && \
# git config --global user.name "User Name" && \ # 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 && \ cd cesium && \
yarn install --ignore-engines yarn install --ignore-engines
# Restore cordova platforms # Restore cordova platforms
RUN cd cesium && \ RUN cd cesium && \
ionic state restore yarn run install-platforms
# TODO: Test First Build so that it will be faster later # TODO: Test First Build so that it will be faster later
## ionic cordova build android --prod --no-interactive --release ## ionic cordova build android --prod --no-interactive --release
WORKDIR cesium WORKDIR cesium
EXPOSE 8100 35729 EXPOSE 8100 35729
CMD ["ionic", "serve"] CMD ["yarn", "run", "start"]
scripts/env-global.sh
+ 1
− 1
View file @ 5d64d869
...@@ -23,7 +23,7 @@ REPO_PUBLIC_URL="https://github.com/${REPO}" ...@@ -23,7 +23,7 @@ REPO_PUBLIC_URL="https://github.com/${REPO}"
NODEJS_VERSION=10 NODEJS_VERSION=10
ANDROID_NDK_VERSION=r19c 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_ROOT=/usr/lib/android-sdk
ANDROID_SDK_TOOLS_VERSION=4333796 ANDROID_SDK_TOOLS_VERSION=4333796
ANDROID_OUTPUT_APK=${PROJECT_DIR}/platforms/android/build/outputs/apk ANDROID_OUTPUT_APK=${PROJECT_DIR}/platforms/android/build/outputs/apk
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment