diff

diff -u /home/lsandov1/repos/tf/dockerfiles/bionic-amd64-tf-a-build/Dockerfile /home/lsandov1/repos/tf/dockerfiles/bionic-amd64-tf-m-build/Dockerfile
--- /home/lsandov1/repos/tf/dockerfiles/bionic-amd64-tf-a-build/Dockerfile	2020-10-30 11:27:16.014786401 -0600
+++ /home/lsandov1/repos/tf/dockerfiles/bionic-amd64-tf-m-build/Dockerfile	2020-10-30 11:11:52.069777265 -0600
@@ -93,10 +93,14 @@
     && apt clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+## Latest toolchains, available in $PATH. There can be newer versions of toolchains at
+## upstream projects but these are latest for the docker image
+
 ### Install GNU toolchain (arm-none-eabi)
-ARG GNU_GCC_ARM_VERSION="9.2-2019.12"
-ARG GNU_GCC_ARM_TAR="gcc-arm-${GNU_GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz"
-ARG GNU_GCC_ARM_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/${GNU_GCC_ARM_VERSION}/binrel/${GNU_GCC_ARM_TAR}"
+ARG GNU_GCC_ARM_VERSION="7-2018-q2-update"
+ARG GNU_GCC_ARM_TAR="gcc-arm-none-eabi-${GNU_GCC_ARM_VERSION}-linux.tar.bz2"
+ARG GNU_GCC_ARM_URL='https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2\
+?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain%20Downloads,64-bit,,Linux,7-2018-q2-update'
 
 RUN curl --create-dirs -fsSLo /tmp/${GNU_GCC_ARM_TAR} ${GNU_GCC_ARM_URL} \
     && tar -xf /tmp/${GNU_GCC_ARM_TAR} -C ${TOOLS_DIR} --strip-components=1 \
@@ -108,7 +112,7 @@
 ARG GNU_GCC_AARCH64_URL="https://developer.arm.com/-/media/Files/downloads/gnu-a/$GNU_GCC_AARCH64_VERSION/binrel/${GNU_GCC_AARCH64_TAR}"
 
 RUN curl --create-dirs -fsSLo /tmp/${GNU_GCC_AARCH64_TAR} ${GNU_GCC_AARCH64_URL} \
-    && tar -xf /tmp/${GNU_GCC_AARCH64_TAR} -C ${TOOLS_DIR} --strip-components=1 \
+    && tar -Jxf /tmp/${GNU_GCC_AARCH64_TAR} -C ${TOOLS_DIR} --strip-components=1 \
     && rm /tmp/${GNU_GCC_AARCH64_TAR}
 
 ### Install Arm Clang (armclang)
@@ -120,7 +124,7 @@
 
 RUN curl --create-dirs -fsSLo /tmp/${ARM_CLANG_TAR} ${ARM_CLANG_URL} \
     && mkdir -p ${ARM_CLANG_INSTALL_DIR} \
-    && tar -xf /tmp/${ARM_CLANG_TAR} -C ${ARM_CLANG_INSTALL_DIR} \
+    && tar -xzf /tmp/${ARM_CLANG_TAR} -C ${ARM_CLANG_INSTALL_DIR} \
     && ${ARM_CLANG_INSTALL_DIR}/install_x86_64.sh \
             --no-interactive \
             --i-agree-to-the-contained-eula \

Diff finished.  Fri Oct 30 11:27:26 2020