From 28eaefc481a902664e136d5f80a717e30dff22f2 Mon Sep 17 00:00:00 2001 From: brianp Date: Fri, 13 Jan 2023 15:02:59 +0100 Subject: [PATCH] Upgrade the rust toolchain --- README.md | 4 ++-- ndk-build/Dockerfile | 2 +- rust/build/Dockerfile | 4 ++-- sqlite-mobile/Dockerfile | 2 +- ssl-mobile/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 13d6300..8065e8d 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Containers for building rust applications ```bash # in rust/build/ -docker build -t quay.io/tarilabs/rust_tari-build-with-deps:nightly-2021-11-20 . +docker build -t quay.io/tarilabs/rust_tari-build-with-deps:nightly-2022-11-03 . # in ndk-build/ -docker build -t quay.io/tarilabs/rust-ndk:1.58.0_r21b . +docker build -t quay.io/tarilabs/rust-ndk:1.67.0_r21b . # in sqlite-mobile/ docker build -t quay.io/tarilabs/sqlite-mobile:202201112328 . diff --git a/ndk-build/Dockerfile b/ndk-build/Dockerfile index 3ec693b..c1d4dd8 100644 --- a/ndk-build/Dockerfile +++ b/ndk-build/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2021-11-20 +FROM quay.io/tarilabs/rust_tari-build-with-deps:nightly-2022-11-03 ARG NDK_VERSION=r21b ARG ANDROID_NDK_HOME=/opt/android-ndk diff --git a/rust/build/Dockerfile b/rust/build/Dockerfile index f97bbe5..2661ca7 100644 --- a/rust/build/Dockerfile +++ b/rust/build/Dockerfile @@ -1,7 +1,7 @@ # Build image for the Tari project; includes SQLite, clippy, rustfmt and other development tools -FROM rust:1.58 +FROM rust:1.66 -ARG NIGHTLY_VERSION=nightly-2021-11-20 +ARG NIGHTLY_VERSION=nightly-2022-11-03 # libs contains: # https://www.sqlite.org/2019/sqlite-autoconf-3290000.tar.gz diff --git a/sqlite-mobile/Dockerfile b/sqlite-mobile/Dockerfile index 2116fa1..87b33b2 100644 --- a/sqlite-mobile/Dockerfile +++ b/sqlite-mobile/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/tarilabs/rust-ndk:1.58.0_r21b as base +FROM quay.io/tarilabs/rust-ndk:1.67.0_r21b as base RUN apt-get update && apt-get install libdigest-sha3-perl diff --git a/ssl-mobile/Dockerfile b/ssl-mobile/Dockerfile index 0116bb1..5e44dc3 100644 --- a/ssl-mobile/Dockerfile +++ b/ssl-mobile/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/tarilabs/rust-ndk:1.53.0_r21b as base +FROM quay.io/tarilabs/rust-ndk:1.67.0_r21b as base # Dependency Downloads ARG OPENSSL_VERSION=1.1.1h