Deal with ARCH mismatch for cloudflared install

Author: gbraad

.devcontainer/almalinux/Containerfile

@@ -72,7 +72,8 @@ RUN dnf config-manager --add-repo https://pkgs.tailscale.com/stable/rhel/9/tails
     && systemctl enable tailscaled
 
 # restore cloudflared install
-RUN curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
+RUN ARCH=$( [ "$ARCH" = "amd64" ] && echo "x86_64" || { [ "$ARCH" = "arm64" ] && echo "aarch64" || echo "$ARCH"; } ) \
+    && curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
     && dnf install -y \
         /tmp/cloudflared.rpm \
     && dnf clean all \

.devcontainer/centos/Containerfile

@@ -70,7 +70,8 @@ RUN dnf config-manager --add-repo https://pkgs.tailscale.com/stable/centos/9/tai
     && systemctl enable tailscaled
 
 # restore cloudflared install
-RUN curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
+RUN ARCH=$( [ "$ARCH" = "amd64" ] && echo "x86_64" || { [ "$ARCH" = "arm64" ] && echo "aarch64" || echo "$ARCH"; } ) \
+    && curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
     && dnf install -y \
         /tmp/cloudflared.rpm \
     && dnf clean all \

.devcontainer/fedora-eln/Containerfile

@@ -67,7 +67,8 @@ RUN dnf config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable
     && systemctl enable tailscaled
 
 # restore cloudflared install
-RUN curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
+RUN ARCH=$( [ "$ARCH" = "amd64" ] && echo "x86_64" || { [ "$ARCH" = "arm64" ] && echo "aarch64" || echo "$ARCH"; } ) \
+    && curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
     && dnf install -y \
         /tmp/cloudflared.rpm \
     && dnf clean all \

.devcontainer/fedora/Containerfile

@@ -69,7 +69,8 @@ RUN dnf config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable
     && systemctl enable tailscaled
 
 # restore cloudflared install
-RUN curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
+RUN ARCH=$( [ "$ARCH" = "amd64" ] && echo "x86_64" || { [ "$ARCH" = "arm64" ] && echo "aarch64" || echo "$ARCH"; } ) \
+    && curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
     && dnf install -y \
         /tmp/cloudflared.rpm \
     && dnf clean all \

.devcontainer/ubi9/Containerfile

@@ -73,7 +73,8 @@ RUN dnf config-manager --add-repo https://pkgs.tailscale.com/stable/rhel/9/tails
     && systemctl enable tailscaled
 
 # restore cloudflared install
-RUN curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
+RUN ARCH=$( [ "$ARCH" = "amd64" ] && echo "x86_64" || { [ "$ARCH" = "arm64" ] && echo "aarch64" || echo "$ARCH"; } ) \
+    && curl -fsSL https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${ARCH}.rpm -o /tmp/cloudflared.rpm \
     && dnf install -y \
         /tmp/cloudflared.rpm \
     && dnf clean all \