Merge mac docker build fix from integration into main for release

usnistgov · Jun 27, 2024 · 9cab880 · 9cab880
2 parents 99db4ed + b43a113
commit 9cab880
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker/jq/Dockerfile b/docker/jq/Dockerfile
@@ -8,14 +8,14 @@ WORKDIR /root
 # Download a jq binary and do a checksum check on it
 COPY jq-linux-amd64.sha256 jq-linux-arm64.sha256 ./
 RUN arch=$(uname -m) && \
-    { [ "$arch" != "x86_64" ] || arch="amd64"; } && \
+    { [ "$arch" != "x86_64" ] || arch="amd64"; [ "$arch" != "aarch64" ] || arch="arm64"; } && \
     curl -L -o jq-linux-$arch \
     https://github.com/stedolan/jq/releases/download/jq-1.7.1/jq-linux-$arch && \
     sha256sum -c jq-linux-$arch.sha256
 
 # install jq
 RUN arch=$(uname -m) && \
-    { [ "$arch" != "x86_64" ] || arch="amd64"; } && \
+    { [ "$arch" != "x86_64" ] || arch="amd64"; [ "$arch" != "aarch64" ] || arch="arm64"; } && \
     chmod a+x jq-linux-$arch && cp jq-linux-$arch /usr/local/bin/jq
 
 CMD ["bash"]