From a4e2d222b71d983a2a857673cf88d480bc8d439a Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Fri, 14 May 2021 10:41:12 +0200 Subject: [PATCH] There's no need in complicated logic since we can not (easily) change entry point after all --- ci/docker/compose-web/Dockerfile-Basic | 2 -- ci/docker/compose-web/bootstrap.sh | 14 ++++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ci/docker/compose-web/Dockerfile-Basic b/ci/docker/compose-web/Dockerfile-Basic index e6572c3a1f..5eade68b81 100644 --- a/ci/docker/compose-web/Dockerfile-Basic +++ b/ci/docker/compose-web/Dockerfile-Basic @@ -47,5 +47,3 @@ WORKDIR androidx-main COPY bootstrap.sh bootstrap.sh RUN chmod a+x bootstrap.sh - -ENTRYPOINT ./bootstrap.sh diff --git a/ci/docker/compose-web/bootstrap.sh b/ci/docker/compose-web/bootstrap.sh index cabaccf1a0..19c26e444d 100644 --- a/ci/docker/compose-web/bootstrap.sh +++ b/ci/docker/compose-web/bootstrap.sh @@ -4,20 +4,14 @@ function bootstrap() { cd /androidx-main ~/bin/repo init -u https://android.googlesource.com/platform/manifest \ -b androidx-main --depth=1 --partial-clone --clone-filter=blob:limit=10M - ~/bin/repo sync -c --no-tags --no-clone-bundle -j4 + ~/bin/repo sync -c --no-tags --no-clone-bundle -j$(nproc --all) mkdir -p /mnt/agent ln -sf /androidx-main/tools/ /mnt/agent/tools ln -sf /androidx-main/prebuilts/ /mnt/agent/prebuilts ln -sf /androidx-main/external /mnt/agent/external -} -if [ ! -e /tmp/init ]; then - touch /tmp/init - echo "bootstrapping" - bootstrap -else - echo "not bootstrapping, all done" -fi + rm -rf /androidx-main/frameworks +} -/bin/bash +bootstrap