From ed495ea09e7cbe95dd5baea2ddf1b373ed1dfa48 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Thu, 13 May 2021 11:34:32 +0200 Subject: [PATCH] Bootrstrapping androix repositoy in lite Dockerfile done right --- ci/docker/compose-web/Dockerfile-Basic | 2 ++ ci/docker/compose-web/bootstrap.sh | 32 ++++++++++++++++++-------- ci/docker/compose-web/init.gradle | 5 ---- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ci/docker/compose-web/Dockerfile-Basic b/ci/docker/compose-web/Dockerfile-Basic index 5eade68b81..e6572c3a1f 100644 --- a/ci/docker/compose-web/Dockerfile-Basic +++ b/ci/docker/compose-web/Dockerfile-Basic @@ -47,3 +47,5 @@ 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 df8bb519df..4e952ffd23 100644 --- a/ci/docker/compose-web/bootstrap.sh +++ b/ci/docker/compose-web/bootstrap.sh @@ -1,9 +1,23 @@ -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 - -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 +#!/bin/bash + +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 + + 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" + sleep 10 +else + echo "not bootstrapping, all done" +fi + +/bin/bash diff --git a/ci/docker/compose-web/init.gradle b/ci/docker/compose-web/init.gradle index 00171f1e2e..bd450c620e 100644 --- a/ci/docker/compose-web/init.gradle +++ b/ci/docker/compose-web/init.gradle @@ -76,9 +76,4 @@ allprojects { url("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } - - task bootstrap(type: Exec) { - workingDir "/androidx-main" - commandLine "/androidx-main/bootstrap.sh" - } }