Node: Update `ldd|awk` to account for Bookworm's merged `/usr` #14950

nodejs-github-bot · 2023-06-28T03:27:02Z

Pull Request: nodejs/docker-node#1927
@LaurentGoderre @PeterDaveHello @SimenB @Starefossen @nschonni @ttshivers

github-actions · 2023-06-28T03:30:05Z

Diff for c9ce895:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 782ccc8..83f4dc4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -24,7 +24,7 @@ Directory: 16/bookworm
 
 Tags: 16-bookworm-slim, 16.20-bookworm-slim, 16.20.1-bookworm-slim, gallium-bookworm-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 16/bookworm-slim
 
 Tags: 16-bullseye, 16.20-bullseye, 16.20.1-bullseye, gallium-bullseye
@@ -34,12 +34,12 @@ Directory: 16/bullseye
 
 Tags: 16-bullseye-slim, 16.20-bullseye-slim, 16.20.1-bullseye-slim, gallium-bullseye-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 16/bullseye-slim
 
 Tags: 16-buster-slim, 16-slim, 16.20-buster-slim, 16.20-slim, 16.20.1-buster-slim, 16.20.1-slim, gallium-buster-slim, gallium-slim
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 16/buster-slim
 
 Tags: 18, 18-bookworm, 18.16, 18.16-bookworm, 18.16.1, 18.16.1-bookworm, hydrogen, hydrogen-bookworm, lts, lts-bookworm, lts-hydrogen
@@ -59,7 +59,7 @@ Directory: 18/alpine3.17
 
 Tags: 18-bookworm-slim, 18-slim, 18.16-bookworm-slim, 18.16-slim, 18.16.1-bookworm-slim, 18.16.1-slim, hydrogen-bookworm-slim, hydrogen-slim, lts-bookworm-slim, lts-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 18/bookworm-slim
 
 Tags: 18-bullseye, 18.16-bullseye, 18.16.1-bullseye, hydrogen-bullseye, lts-bullseye
@@ -69,7 +69,7 @@ Directory: 18/bullseye
 
 Tags: 18-bullseye-slim, 18.16-bullseye-slim, 18.16.1-bullseye-slim, hydrogen-bullseye-slim, lts-bullseye-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 18/bullseye-slim
 
 Tags: 18-buster, 18.16-buster, 18.16.1-buster, hydrogen-buster, lts-buster
@@ -79,7 +79,7 @@ Directory: 18/buster
 
 Tags: 18-buster-slim, 18.16-buster-slim, 18.16.1-buster-slim, hydrogen-buster-slim, lts-buster-slim
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 18/buster-slim
 
 Tags: 20, 20-bookworm, 20.3, 20.3-bookworm, 20.3.1, 20.3.1-bookworm, bookworm, current, current-bookworm, latest
@@ -99,7 +99,7 @@ Directory: 20/alpine3.17
 
 Tags: 20-bookworm-slim, 20-slim, 20.3-bookworm-slim, 20.3-slim, 20.3.1-bookworm-slim, 20.3.1-slim, bookworm-slim, current-bookworm-slim, current-slim, slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 20/bookworm-slim
 
 Tags: 20-bullseye, 20.3-bullseye, 20.3.1-bullseye, bullseye, current-bullseye
@@ -109,7 +109,7 @@ Directory: 20/bullseye
 
 Tags: 20-bullseye-slim, 20.3-bullseye-slim, 20.3.1-bullseye-slim, bullseye-slim, current-bullseye-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 20/bullseye-slim
 
 Tags: 20-buster, 20.3-buster, 20.3.1-buster, buster, current-buster
@@ -119,5 +119,5 @@ Directory: 20/buster
 
 Tags: 20-buster-slim, 20.3-buster-slim, 20.3.1-buster-slim, buster-slim, current-buster-slim
 Architectures: amd64, arm32v7, arm64v8
-GitCommit: d9c01570c0f72a40cbaece69c378d7c8187c56e9
+GitCommit: a9702c9a6111be461c356b8b61983d568bd39414
 Directory: 20/buster-slim
diff --git a/node_current-bullseye-slim/Dockerfile b/node_current-bullseye-slim/Dockerfile
index 266dda4..e6aff3c 100644
--- a/node_current-bullseye-slim/Dockerfile
+++ b/node_current-bullseye-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_current-buster-slim/Dockerfile b/node_current-buster-slim/Dockerfile
index 7fc30e7..e42dda8 100644
--- a/node_current-buster-slim/Dockerfile
+++ b/node_current-buster-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_gallium-bookworm-slim/Dockerfile b/node_gallium-bookworm-slim/Dockerfile
index 0298c05..c712cd2 100644
--- a/node_gallium-bookworm-slim/Dockerfile
+++ b/node_gallium-bookworm-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_gallium-bullseye-slim/Dockerfile b/node_gallium-bullseye-slim/Dockerfile
index 0ac5780..edb62a4 100644
--- a/node_gallium-bullseye-slim/Dockerfile
+++ b/node_gallium-bullseye-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_gallium-slim/Dockerfile b/node_gallium-slim/Dockerfile
index 0244c7b..b7cf81f 100644
--- a/node_gallium-slim/Dockerfile
+++ b/node_gallium-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_lts-bullseye-slim/Dockerfile b/node_lts-bullseye-slim/Dockerfile
index 19d5b00..6bc737a 100644
--- a/node_lts-bullseye-slim/Dockerfile
+++ b/node_lts-bullseye-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_lts-buster-slim/Dockerfile b/node_lts-buster-slim/Dockerfile
index 0666c4e..c1a06e5 100644
--- a/node_lts-buster-slim/Dockerfile
+++ b/node_lts-buster-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_lts-slim/Dockerfile b/node_lts-slim/Dockerfile
index bdcfd95..21a17f2 100644
--- a/node_lts-slim/Dockerfile
+++ b/node_lts-slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
diff --git a/node_slim/Dockerfile b/node_slim/Dockerfile
index 442c3d4..eba8396 100644
--- a/node_slim/Dockerfile
+++ b/node_slim/Dockerfile
@@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && apt-mark auto '.*' > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-      | awk '/=>/ { print $(NF-1) }' \
+      | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
       | sort -u \
       | xargs -r dpkg-query --search \
       | cut -d: -f1 \
@@ -77,7 +77,7 @@ RUN set -ex \
   && apt-mark auto '.*' > /dev/null \
   && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \
   && find /usr/local -type f -executable -exec ldd '{}' ';' \
-    | awk '/=>/ { print $(NF-1) }' \
+    | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \

Relevant Maintainers:

node: @nodejs

Node: Update ldd|awk to account for Bookworm's merged /usr

c9ce895

github-actions bot mentioned this pull request Jun 28, 2023

Update ldd|awk to account for Bookworm's merged /usr nodejs/docker-node#1927

Merged

12 tasks

github-actions bot added the library/node label Jun 28, 2023

tianon merged commit e5fe8d7 into docker-library:master Jun 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Node: Update `ldd|awk` to account for Bookworm's merged `/usr` #14950

Node: Update `ldd|awk` to account for Bookworm's merged `/usr` #14950

Uh oh!

nodejs-github-bot commented Jun 28, 2023

Uh oh!

github-actions bot commented Jun 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Node: Update ldd|awk to account for Bookworm's merged /usr #14950

Node: Update ldd|awk to account for Bookworm's merged /usr #14950

Uh oh!

Conversation

nodejs-github-bot commented Jun 28, 2023

Uh oh!

github-actions bot commented Jun 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Node: Update `ldd|awk` to account for Bookworm's merged `/usr` #14950

Node: Update `ldd|awk` to account for Bookworm's merged `/usr` #14950