From 190fabc081c3df3e73c240b5c648b4696a485177 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 21 May 2021 17:56:46 +0200 Subject: [PATCH] updated all dockerfiles --- bsp_hosted/Dockerfile | 10 ++++++---- bsp_linux/Dockerfile | 10 ++++++---- bsp_stm32_freertos/Dockerfile | 25 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 bsp_stm32_freertos/Dockerfile diff --git a/bsp_hosted/Dockerfile b/bsp_hosted/Dockerfile index 327b5f4..7372907 100644 --- a/bsp_hosted/Dockerfile +++ b/bsp_hosted/Dockerfile @@ -1,8 +1,9 @@ -FROM alpine:latest +# FROM alpine:latest +FROM ubuntu:latest -# RUN apt-get update -y && apt-get upgrade -y -# RUN apt-get install -y cmake g++ -RUN apk add cmake make g++ +RUN apt-get update -y && apt-get upgrade -y +RUN apt-get install -y cmake g++ +# RUN apk add cmake make g++ WORKDIR /usr/src/app COPY . . @@ -15,3 +16,4 @@ RUN set -ex; \ ENTRYPOINT ["cmake", "--build", "build-hosted"] CMD ["-j"] +# CMD ["sh"] diff --git a/bsp_linux/Dockerfile b/bsp_linux/Dockerfile index 4a6ac88..ec6a678 100644 --- a/bsp_linux/Dockerfile +++ b/bsp_linux/Dockerfile @@ -1,8 +1,9 @@ -FROM alpine:latest +# FROM alpine:latest +FROM ubuntu:latest -# RUN apt-get update -y && apt-get upgrade -y -# RUN apt-get install -y cmake g++ -RUN apk add cmake make g++ +RUN apt-get update -y && apt-get upgrade -y +RUN apt-get install -y cmake g++ +# RUN apk add cmake make g++ WORKDIR /usr/src/app COPY . . @@ -15,3 +16,4 @@ RUN set -ex; \ ENTRYPOINT ["cmake", "--build", "build-linux"] CMD ["-j"] +# CMD ["sh"] diff --git a/bsp_stm32_freertos/Dockerfile b/bsp_stm32_freertos/Dockerfile new file mode 100644 index 0000000..362c4a6 --- /dev/null +++ b/bsp_stm32_freertos/Dockerfile @@ -0,0 +1,25 @@ +# FROM alpine:latest +FROM ubuntu:latest + +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 +# RUN apk add cmake make g++ 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}" +WORKDIR /usr/src/app +COPY . . + +RUN set -ex; \ + rm -rf build-freertos; \ + mkdir build-freertos; \ + cd build-freertos; \ + cmake -DCMAKE_BUILD_TYPE=Release -DOS_FSFW=freertos -DTGT_BSP=arm/stm32h743zi-nucleo ..; + +ENTRYPOINT ["cmake", "--build", "build-freertos"] +CMD ["-j"] +# CMD ["sh"]