From 40165c58b36225311ae0f714c244d1da81431f9c Mon Sep 17 00:00:00 2001 From: sdn-ninja Date: Wed, 18 Sep 2024 00:42:08 +0100 Subject: [PATCH 1/2] Update Dockerfile fix for machine arch retrieval --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f9c51c3..59b5d95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,11 @@ RUN export PATH="/opt/vcpkg:${PATH}" \ && vcpkg install --clean-after-build # install SDRplay API -RUN export ARCH=$(uname -m) \ +RUN if [ $(uname -m) = "x86_64" ] || [ $(uname -m) = "amd64" ]; then \ + export ARCH="amd64"; \ + else \ + export ARCH=$(uname -m); \ + fi \ && export MAJVER="3.15" \ && export MINVER="2" \ && export VER=${MAJVER}.${MINVER} \ From f68f794a73028ae66646771787df6d88122aff11 Mon Sep 17 00:00:00 2001 From: sdn-ninja Date: Fri, 20 Sep 2024 23:47:23 +0100 Subject: [PATCH 2/2] Update Dockerfile further fix --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59b5d95..b77b2bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,11 +27,10 @@ RUN export PATH="/opt/vcpkg:${PATH}" \ && vcpkg install --clean-after-build # install SDRplay API -RUN if [ $(uname -m) = "x86_64" ] || [ $(uname -m) = "amd64" ]; then \ - export ARCH="amd64"; \ - else \ - export ARCH=$(uname -m); \ - fi \ +RUN export ARCH=$(uname -m) \ + && if [ "$ARCH" = "x86_64" ]; then \ + ARCH="amd64"; \ + fi \ && export MAJVER="3.15" \ && export MINVER="2" \ && export VER=${MAJVER}.${MINVER} \