From 0cf9290575e7533921b5f0f0698194d8df0b4975 Mon Sep 17 00:00:00 2001
From: Brett Smith <brett.smith@curii.com>
Date: Fri, 29 Dec 2023 13:26:57 -0500
Subject: [PATCH] 20846/18874: Use standard yarn install process for
 debian12/ubuntu2204

Pre-commit, these builds are failing with:

node[6]: ../src/node_platform.cc:61:std::unique_ptr<long unsigned int> node::WorkerThreadsTaskRunner::DelayedTaskScheduler::Start(): Assertion `(0) == (uv_thread_create(t.get(), start_thread, this))' failed.
 1: 0xa1ae50 node::Abort() [node]
 2: 0xa1aece  [node]
 3: 0xa8c40a node::WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int) [node]
 4: 0xa8c4da node::NodePlatform::NodePlatform(int, v8::TracingController*) [node]
 5: 0x9eaa69 node::InitializeOncePerProcess(int, char**) [node]
 6: 0x9eaf61 node::Start(int, char**) [node]
 7: 0x7f2c67c75d90  [/lib/x86_64-linux-gnu/libc.so.6]
 8: 0x7f2c67c75e40 __libc_start_main [/lib/x86_64-linux-gnu/libc.so.6]
 9: 0x982005  [node]
Aborted (core dumped)
The command '/bin/sh -c env -C /usr/local/node-v12.22.12-linux-x64/bin PATH="$PATH:." ./npm install -g yarn' returned a non-zero code: 134

I think this is most likely due to a Linux/libc incompatibility between
the host system (Debian 11, I think) and Debian 12/Ubuntu 22.04. I
don't *think* it's because I changed the yarn install invocation. But, I
have to be sure. This commit is me checking. If I'm wrong, and the build
really does work this way, I will be very unhappy about it.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>
---
 build/package-build-dockerfiles/debian12/Dockerfile   | 6 ++++--
 build/package-build-dockerfiles/ubuntu2204/Dockerfile | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/package-build-dockerfiles/debian12/Dockerfile b/build/package-build-dockerfiles/debian12/Dockerfile
index 859c1a8597..a8df5a3d04 100644
--- a/build/package-build-dockerfiles/debian12/Dockerfile
+++ b/build/package-build-dockerfiles/debian12/Dockerfile
@@ -15,7 +15,8 @@ ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/
-ONBUILD RUN env -C /usr/local/node-v12.22.12-linux-x64/bin PATH="$PATH:." ./npm install -g yarn
+ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
+ONBUILD RUN npm install -g yarn
 ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
 # On x86, we want some cross-compilation support for arm64
 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64
@@ -32,7 +33,8 @@ ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/
-ONBUILD RUN env -C /usr/local/node-v12.22.12-linux-arm64/bin PATH="$PATH:." ./npm install -g yarn
+ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/
+ONBUILD RUN npm install -g yarn
 ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/
 
 FROM build_${HOSTTYPE}
diff --git a/build/package-build-dockerfiles/ubuntu2204/Dockerfile b/build/package-build-dockerfiles/ubuntu2204/Dockerfile
index 533cdd8641..e7118cc4c4 100644
--- a/build/package-build-dockerfiles/ubuntu2204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu2204/Dockerfile
@@ -14,7 +14,8 @@ ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v12.22.12-linux-x64.tar.xz /usr/local/
-ONBUILD RUN env -C /usr/local/node-v12.22.12-linux-x64/bin PATH="$PATH:." ./npm install -g yarn
+ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
+ONBUILD RUN npm install -g yarn
 ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-x64/bin/* /usr/local/bin/
 # On x86, we want some cross-compilation support for arm64
 # Add gcc-aarch64-linux-gnu to compile go binaries for arm64
@@ -33,7 +34,8 @@ ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/
 ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/
 # Install nodejs and npm
 ONBUILD ADD generated/node-v12.22.12-linux-arm64.tar.xz /usr/local/
-ONBUILD RUN env -C /usr/local/node-v12.22.12-linux-arm64/bin PATH="$PATH:." ./npm install -g yarn
+ONBUILD RUN ln -s /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/
+ONBUILD RUN npm install -g yarn
 ONBUILD RUN ln -sf /usr/local/node-v12.22.12-linux-arm64/bin/* /usr/local/bin/
 
 FROM build_${HOSTTYPE}
-- 
2.30.2