From 237c68f9fe7d181ca28fe7bf1411f681948ce084 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Thu, 2 Nov 2023 16:13:07 +0000 Subject: [PATCH 1/4] change entry point for testing --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fde2d8c..ffb1ca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -216,4 +216,4 @@ RUN ln -sf /proc/1/fd/1 /var/log/docker.log # Set the entry point to init.sh ################################ -ENTRYPOINT /root/init.sh +ENTRYPOINT ["tail", "-f", "/dev/null"] -- GitLab From 0125dfec710ed77d1594f6c7e806fb33a3d71e59 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Thu, 2 Nov 2023 16:48:18 +0000 Subject: [PATCH 2/4] Revert "change entry point for testing" This reverts commit 237c68f9fe7d181ca28fe7bf1411f681948ce084 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffb1ca9..fde2d8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -216,4 +216,4 @@ RUN ln -sf /proc/1/fd/1 /var/log/docker.log # Set the entry point to init.sh ################################ -ENTRYPOINT ["tail", "-f", "/dev/null"] +ENTRYPOINT /root/init.sh -- GitLab From bd133da7767d951901431991be1e8df7ab5376bb Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Thu, 2 Nov 2023 16:49:14 +0000 Subject: [PATCH 3/4] stay on python 3 --- src/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/build.sh b/src/build.sh index 6e3aba4..c954732 100755 --- a/src/build.sh +++ b/src/build.sh @@ -239,8 +239,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then echo ">> [$(date)] Starting build for ${DEVICE}, ${BRANCH_NAME} branch" build_successful=false echo ">> [$(date)] ANDROID_JACK_VM_ARGS=${ANDROID_JACK_VM_ARGS}" - echo ">> [$(date)] Switch to Python2" - ln -fs /usr/bin/python2 /usr/bin/python BRUNCH_DEVICE=${DEVICE} -- GitLab From bf08e3d8a43979619432875eb3a4472d4a28a874 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Thu, 2 Nov 2023 17:04:04 +0000 Subject: [PATCH 4/4] no need to switch back --- src/build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/build.sh b/src/build.sh index c954732..8dab135 100755 --- a/src/build.sh +++ b/src/build.sh @@ -467,9 +467,6 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then fi - echo ">> [$(date)] Switch back to Python3" - ln -fs /usr/bin/python3 /usr/bin/python - fi if [ "$DELETE_OLD_LOGS" -gt "0" ]; then -- GitLab