From 72caa2aa68409d8b81fddaabf50356dd56c5e7bc Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 1 Dec 2021 16:30:28 +0100 Subject: [PATCH] Android Dockerfiles better apt options --- build_scripts/Android/Dockerfile | 8 +++++--- build_scripts/GitlabCI/Android.Dockerfile | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build_scripts/Android/Dockerfile b/build_scripts/Android/Dockerfile index 3d45bdf9a..490a247c9 100644 --- a/build_scripts/Android/Dockerfile +++ b/build_scripts/Android/Dockerfile @@ -25,14 +25,16 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive +ENV APT_UNAT="--assume-yes --quiet" -RUN apt-get update && apt-get upgrade -y && apt-get clean -RUN apt-get install --no-install-recommends --assume-yes --quiet \ +RUN apt-get update $APT_UNAT && apt-get upgrade --show-upgraded $APT_UNAT && \ + apt-get clean $APT_UNAT +RUN apt-get install --no-install-recommends $APT_UNAT \ bash build-essential bzip2 cmake curl chrpath doxygen \ git p7zip python qt5-default qttools5-dev tclsh unzip wget zip # Dependencies to create Android pkg -RUN apt-get install --no-install-recommends --assume-yes --quiet \ +RUN apt-get install --no-install-recommends $APT_UNAT \ openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless gradle ARG FRESHCLONE=0 diff --git a/build_scripts/GitlabCI/Android.Dockerfile b/build_scripts/GitlabCI/Android.Dockerfile index 88c73cd44..bc4bd0755 100644 --- a/build_scripts/GitlabCI/Android.Dockerfile +++ b/build_scripts/GitlabCI/Android.Dockerfile @@ -1,7 +1,9 @@ ARG ANDROID_NDK_ARCH=arm FROM registry.gitlab.com/retroshare/retroshare:android_${ANDROID_NDK_ARCH}_base -RUN apt-get update -y && apt-get upgrade --assume-yes --quiet --show-upgraded +ENV APT_UNAT="--assume-yes --quiet" + +RUN apt-get update $APT_UNAT && apt-get upgrade $APT_UNAT --show-upgraded ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git ARG REPO_BRANCH=master