From 143ded24de26dbd9799b518cecbe2b51d8aec0c8 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 21 May 2021 18:19:08 +0200 Subject: [PATCH] version is now arg --- bsp_stm32_freertos/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bsp_stm32_freertos/Dockerfile b/bsp_stm32_freertos/Dockerfile index beb3214..fa52c60 100644 --- a/bsp_stm32_freertos/Dockerfile +++ b/bsp_stm32_freertos/Dockerfile @@ -2,16 +2,20 @@ FROM ubuntu:latest # Issues with XPM cross-compiler on alpine.. # FROM alpine:latest +# Specify the cross compiler version +# See: https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack +ENV XPM_ARM_XCOMPILER_VERSION = "10.2.1-1.1.2" + RUN apt-get update -y && apt-get upgrade -y RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata RUN apt-get install -y cmake g++ npm; \ npm install --global xpm@latest; \ - xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest + xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@${XPM_ARM_XCOMPILER_VERSION} # RUN apk add cmake make bash npm; \ # npm install --global xpm@latest; \ # xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest -ENV PATH="/root/.local/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/10.2.1-1.1.2/.content/bin:${PATH}" +ENV PATH="/root/.local/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/${XPM_ARM_XCOMPILER_VERSION}/.content/bin:${PATH}" WORKDIR /usr/src/app COPY . .