From dfc189488f35b7dddc2ec56edeba97d0ae167cc8 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 29 Mar 2019 11:07:37 +0300 Subject: [PATCH] Fix dockerfile versions one last time Signed-off-by: Nikita Khateev --- devops/docker/android_build/xenial/Dockerfile | 6 +++--- devops/docker/android_ndk/xenial/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devops/docker/android_build/xenial/Dockerfile b/devops/docker/android_build/xenial/Dockerfile index 8940f947c..cc8feb534 100644 --- a/devops/docker/android_build/xenial/Dockerfile +++ b/devops/docker/android_build/xenial/Dockerfile @@ -1,6 +1,6 @@ ARG ANDROID_PREBUILT_DIR=/tmp/android/libsovtoken_prebuilt -FROM sovrin/libsovtoken:android_ndk-xenial-0.5.0 +FROM sovrin/libsovtoken:android_ndk-xenial-0.6.0 # TODO LABEL maintainer="Name " ARG ANDROID_PREBUILT_DIR @@ -12,7 +12,7 @@ RUN chmod -R 777 ${ANDROID_PREBUILT_DIR} ############################################ -FROM sovrin/libsovtoken:android_ndk-xenial-0.5.0 +FROM sovrin/libsovtoken:android_ndk-xenial-0.6.0 # TODO LABEL maintainer="Name " ARG u_id=1000 @@ -50,4 +50,4 @@ ENV RUST_TARGETS=${RUST_TARGETS:-"arm-linux-androideabi armv7-linux-androideabi # TODO some entrypoint -ENV LIBSOVTOKEN_ANDROID_BUILD_ENV_VERSION=0.5.0 +ENV LIBSOVTOKEN_ANDROID_BUILD_ENV_VERSION=0.6.0 diff --git a/devops/docker/android_ndk/xenial/Dockerfile b/devops/docker/android_ndk/xenial/Dockerfile index 6a9ea5e20..c6ad13678 100644 --- a/devops/docker/android_ndk/xenial/Dockerfile +++ b/devops/docker/android_ndk/xenial/Dockerfile @@ -1,7 +1,7 @@ ARG ANDROID_NDK_DIR=/tmp/android/android_ndk ARG ANDROID_NDK_VERSION=r16b -FROM sovrin/dockerbase:rust-xenial-0.8.0 +FROM sovrin/dockerbase:rust-xenial-0.12.0 # TODO LABEL maintainer="Name " ARG ANDROID_NDK_VERSION @@ -14,7 +14,7 @@ RUN chmod -R 777 ${ANDROID_NDK_DIR} ############################################ -FROM sovrin/dockerbase:rust-xenial-0.8.0 +FROM sovrin/dockerbase:rust-xenial-0.12.0 # TODO LABEL maintainer="Name " ARG PYTHON3_VERSION @@ -40,4 +40,4 @@ RUN chmod +x /usr/local/bin/android-ndk-install # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_ANDROID_NDK_ENV_VERSION=0.5.0 +ENV LIBSOVTOKEN_ANDROID_NDK_ENV_VERSION=0.6.0