Skip to content

Fix dockerfile versions for android build #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattraffel merged 1 commit into from
Mar 29, 2019
Merged

Fix dockerfile versions for android build #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions devops/docker/android_build/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <email-address>"

ARG ANDROID_PREBUILT_DIR
Expand All @@ -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 <email-address>"

ARG u_id=1000
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions devops/docker/android_ndk/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <email-address>"

ARG ANDROID_NDK_VERSION
Expand All @@ -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 <email-address>"

ARG PYTHON3_VERSION
Expand All @@ -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