diff --git a/docker/Dockerfile b/docker/Dockerfile index b0671cc..2385242 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,6 +10,7 @@ LABEL Description="Fresh Yandex.Tank from github master branch with phantom" Ven RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get install -y sudo && \ + apt-get install -y vim && \ apt-get install -y wget && \ apt-get install software-properties-common -y && \ add-apt-repository ppa:yandex-load/main -y && \ diff --git a/docker/Dockerfile.mobile b/docker/Dockerfile.mobile index 98e3a10..c745097 100644 --- a/docker/Dockerfile.mobile +++ b/docker/Dockerfile.mobile @@ -15,11 +15,26 @@ RUN wget https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz && \ tar -xvzf android-sdk_r24.4.1-linux.tgz && \ mv android-sdk-linux /usr/local/android-sdk + ENV ANDROID_HOME /usr/local/android-sdk ENV PATH $PATH:$ANDROID_HOME/tools ENV PATH $PATH:$ANDROID_HOME/platform-tools ENV JAVA_HOME /usr/lib/jvm/java-8-oracle + +ARG MAVEN_VERSION=3.3.9 +ARG USER_HOME_DIR="/root" + +RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ + && curl -fsSL http://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + | tar -xzC /usr/share/maven --strip-components=1 \ + && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn + +ENV MAVEN_HOME /usr/share/maven +ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" + +VOLUME "$USER_HOME_DIR/.m2" + # some street magic RUN echo "y" | android update sdk --no-ui --force --filter platform-tools