From 7002803dd2c6e4be86fb19c77ceea05e2aabed0c Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Mon, 30 Jun 2025 12:17:39 +0100 Subject: [PATCH] Ensure we only fetch one URL --- scripts/docker/build/rocky10/Dockerfile.cb | 2 +- scripts/docker/build/rocky9/Dockerfile.cb | 2 +- scripts/docker/m4/crossbuild.rpm.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docker/build/rocky10/Dockerfile.cb b/scripts/docker/build/rocky10/Dockerfile.cb index 34d18e46d9..5821a20282 100644 --- a/scripts/docker/build/rocky10/Dockerfile.cb +++ b/scripts/docker/build/rocky10/Dockerfile.cb @@ -27,7 +27,7 @@ RUN curl -sL https://rpm.nodesource.com/setup_20.x | bash - RUN dnf install -y nodejs RUN npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7 # - pandoc -RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4) | tar xzvf - -C /tmp/ +RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/ RUN mv /tmp/pandoc-*/bin/* /usr/local/bin # - asciidoctor RUN dnf install -y rubygems-devel diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb index de65fd94fd..124c704a8d 100644 --- a/scripts/docker/build/rocky9/Dockerfile.cb +++ b/scripts/docker/build/rocky9/Dockerfile.cb @@ -27,7 +27,7 @@ RUN curl -sL https://rpm.nodesource.com/setup_20.x | bash - RUN dnf install -y nodejs RUN npm i -g @antora/cli@3.1.7 @antora/site-generator-default@3.1.7 # - pandoc -RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4) | tar xzvf - -C /tmp/ +RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/ RUN mv /tmp/pandoc-*/bin/* /usr/local/bin # - asciidoctor RUN dnf install -y rubygems-devel diff --git a/scripts/docker/m4/crossbuild.rpm.m4 b/scripts/docker/m4/crossbuild.rpm.m4 index 48134d1840..70b459c02b 100644 --- a/scripts/docker/m4/crossbuild.rpm.m4 +++ b/scripts/docker/m4/crossbuild.rpm.m4 @@ -24,7 +24,7 @@ RUN curl -sL https://rpm.nodesource.com/setup_`'NODE_VER.x | bash - RUN dnf install -y nodejs RUN npm i -g @antora/cli@ANTORA_VER @antora/site-generator-default@ANTORA_VER # - pandoc -RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4) | tar xzvf - -C /tmp/ +RUN curl -o - -L $(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | grep "browser_download_url.*tar.gz" | cut -d '"' -f 4 | head -1) | tar xzvf - -C /tmp/ RUN mv /tmp/pandoc-*/bin/* /usr/local/bin # - asciidoctor RUN dnf install -y rubygems-devel -- 2.47.3