diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..f32a0ec6a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +node.out +node +node.out-*.tar.gz diff --git a/docker/Dockerfile.android b/docker/Dockerfile.android index e715c8fd2..2f5e03523 100644 --- a/docker/Dockerfile.android +++ b/docker/Dockerfile.android @@ -14,17 +14,20 @@ ENV CXXFLAGS -fPIC RUN echo "[0/3] installing packages..." && \ apt-get -qq update && \ - - DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \ + DEBIAN_FRONTEND=noninteractive apt-get -qq install --no-install-recommends -y \ git \ + ca-certificates \ unzip \ gcc gcc-multilib \ g++ g++-multilib \ curl \ - file + file && \ + apt-get clean && rm -r /var/lib/apt/lists/* + RUN echo "[1/2] cloning dependencies..." && \ - git clone https://github.com/sjitech/android-gcc-toolchain + git clone --depth=1 --branch=master https://github.com/sjitech/android-gcc-toolchain && \ + rm -rf android-gcc-toolchain/.git RUN echo "[2/2] setting up..." && \ curl -fSOL https://dl.google.com/android/repository/$NDK_NAME.zip && \ diff --git a/docker/Dockerfile.linux b/docker/Dockerfile.linux index 5e09a1d9c..d15d46715 100644 --- a/docker/Dockerfile.linux +++ b/docker/Dockerfile.linux @@ -7,16 +7,17 @@ ENV _JAVA_OPTIONS -Xms1024m -Xmx1024m -XX:MaxPermSize=512m RUN echo "[0/3] installing packages..." && \ apt-get -qq update && \ - DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \ - openjdk-7-jdk \ + DEBIAN_FRONTEND=noninteractive apt-get -qq install --no-install-recommends -y \ + openjdk-7-jdk \ git \ unzip \ gcc gcc-multilib \ g++ g++-multilib \ curl \ file \ - execstack \ - maven + execstack \ + maven && \ + apt-get clean && rm -r /var/lib/apt/lists/* CMD cd jni && \ echo "building...." && \ @@ -44,4 +45,3 @@ CMD cd jni && \ strip --strip-unneeded -R .note -R .comment libj2v8_linux_x86_64.so && \ cd .. && \ mvn clean verify -e -