From 900e6478634f433bf1812a69b70b050e8c2dda89 Mon Sep 17 00:00:00 2001 From: Hanh Date: Fri, 15 Jul 2022 13:13:33 +0800 Subject: [PATCH] Update builder --- docker/Dockerfile-builder | 2 +- install-deps.sh | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile-builder b/docker/Dockerfile-builder index c7427aa..c57c81d 100755 --- a/docker/Dockerfile-builder +++ b/docker/Dockerfile-builder @@ -7,7 +7,7 @@ RUN ./install-rust.sh FROM builder_rust as builder_flutter COPY install-deps.sh . -RUN --mount=type=cache,target=/tmp ./install-deps.sh +RUN --mount=type=cache,target=/tmp ./install-deps.sh /root /tmp ENV ANDROID_SDK_ROOT /root/Android/sdk ENV ANDROID_NDK_HOME $ANDROID_SDK_ROOT/android-ndk-r21e diff --git a/install-deps.sh b/install-deps.sh index e33af4f..7682bc4 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -x ROOT_DIR=$1 if [ "$ROOT_DIR" == "" ]; then @@ -6,18 +7,18 @@ if [ "$ROOT_DIR" == "" ]; then fi DL_DIR=$2 -if [ "DL_DIR" == "" ]; then +if [ "$DL_DIR" == "" ]; then DL_DIR="/tmp" fi pacman -Sy --noconfirm unzip jdk8-openjdk wget -wget -P $DL_DIR -N https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -wget -P $DL_DIR -N https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip -wget -P $DL_DIR -N https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.0.5-stable.tar.xz +wget -qP $DL_DIR -N https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip +wget -qP $DL_DIR -N https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip +wget -qP $DL_DIR -N https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.0.5-stable.tar.xz -wget -P $DL_DIR -N https://download.z.cash/downloads/sapling-output.params -wget -P $DL_DIR -N https://download.z.cash/downloads/sapling-spend.params +wget -qP $DL_DIR -N https://download.z.cash/downloads/sapling-output.params +wget -qP $DL_DIR -N https://download.z.cash/downloads/sapling-spend.params mkdir -p $ROOT_DIR/Android/sdk export ANDROID_SDK_ROOT=$ROOT_DIR/Android/sdk