From 7a42a2a20889baa8a693e704ca74169b5eff59d4 Mon Sep 17 00:00:00 2001 From: Sam Tobia Date: Tue, 27 Dec 2016 19:42:15 -0800 Subject: [PATCH 1/2] Fix: Downloading/extracting/building in one command to avoid commit issues, Fix: Uses 23.01 --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c43395d..b925d92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,12 @@ apt-get install -y lib32stdc++6 lib32z1 lib32ncurses5 lib32bz2-1.0 g++ ant pytho RUN curl -sL https://deb.nodesource.com/setup_iojs_2.x | sudo bash - && sudo apt-get install -y iojs # download and extract android sdk -RUN curl http://dl.google.com/android/android-sdk_r24.2-linux.tgz | tar xz -C /usr/local/ ENV ANDROID_HOME /usr/local/android-sdk-linux ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools - # update and accept licences -RUN ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | /usr/local/android-sdk-linux/tools/android update sdk --no-ui -a --filter platform-tool,build-tools-22.0.1,android-22 - RUN npm install nativescript -g --unsafe-perm +RUN curl http://dl.google.com/android/android-sdk_r24.2-linux.tgz | tar xz -C /usr/local && \ + ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | /usr/local/android-sdk-linux/tools/android update sdk --no-ui -a --filter platform-tool,build-tools-23.0.1,android-22,extra-android-m2repository ENV GRADLE_USER_HOME /src/gradle VOLUME /src From 9db8779734d67ffb147d0809f2eebe0c67ac06dd Mon Sep 17 00:00:00 2001 From: Sam Tobia Date: Tue, 27 Dec 2016 19:44:33 -0800 Subject: [PATCH 2/2] Dep: Always installing latest stable node, Dev: Moved Node install to avoid redownloading --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b925d92..e90127c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,15 +6,17 @@ apt-get update && \ apt-get install -y lib32stdc++6 lib32z1 lib32ncurses5 lib32bz2-1.0 g++ ant python make RUN curl -sL https://deb.nodesource.com/setup_iojs_2.x | sudo bash - && sudo apt-get install -y iojs +RUN npm install n -g +RUN n stable +RUN npm install nativescript -g --unsafe-perm # download and extract android sdk -ENV ANDROID_HOME /usr/local/android-sdk-linux -ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools # update and accept licences -RUN npm install nativescript -g --unsafe-perm RUN curl http://dl.google.com/android/android-sdk_r24.2-linux.tgz | tar xz -C /usr/local && \ ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | /usr/local/android-sdk-linux/tools/android update sdk --no-ui -a --filter platform-tool,build-tools-23.0.1,android-22,extra-android-m2repository +ENV ANDROID_HOME /usr/local/android-sdk-linux +ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools ENV GRADLE_USER_HOME /src/gradle VOLUME /src WORKDIR /src