From e95ba333a5ea15b8ebd9bbd9cf227b89c6be8ba3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 21 May 2021 19:31:05 +0200
Subject: [PATCH] some more improvements

---
 bsp_hosted/Dockerfile         |  5 ++---
 bsp_linux/Dockerfile          |  4 ++--
 bsp_stm32_freertos/Dockerfile | 12 +++---------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/bsp_hosted/Dockerfile b/bsp_hosted/Dockerfile
index d627677..7a363e7 100644
--- a/bsp_hosted/Dockerfile
+++ b/bsp_hosted/Dockerfile
@@ -1,8 +1,7 @@
 FROM ubuntu:latest
 # FROM alpine:latest
 
-RUN apt-get update -y && apt-get upgrade -y
-RUN apt-get install -y cmake g++
+RUN apt-get update && apt-get install -y cmake g++
 # RUN apk add cmake make g++
 
 WORKDIR /usr/src/app
@@ -16,4 +15,4 @@ RUN set -ex; \
 
 ENTRYPOINT ["cmake", "--build", "build-hosted"]
 CMD ["-j"]
-# CMD ["sh"]
+# CMD ["bash"]
diff --git a/bsp_linux/Dockerfile b/bsp_linux/Dockerfile
index 0802e78..28105f4 100644
--- a/bsp_linux/Dockerfile
+++ b/bsp_linux/Dockerfile
@@ -1,8 +1,7 @@
 FROM ubuntu:latest
 # FROM alpine:latest
 
-RUN apt-get update -y && apt-get upgrade -y
-RUN apt-get install -y cmake g++
+RUN apt-get update && apt-get install -y cmake g++
 # RUN apk add cmake make g++
 
 WORKDIR /usr/src/app
@@ -16,3 +15,4 @@ RUN set -ex; \
 
 ENTRYPOINT ["cmake", "--build", "build-linux"]
 CMD ["-j"]
+# CMD ["bash"]
diff --git a/bsp_stm32_freertos/Dockerfile b/bsp_stm32_freertos/Dockerfile
index 0c81571..4ea753a 100644
--- a/bsp_stm32_freertos/Dockerfile
+++ b/bsp_stm32_freertos/Dockerfile
@@ -4,20 +4,13 @@ ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT="10.2.1-1.1.2"
 
 # Stage 0
 
-FROM ubuntu:latest
+FROM node:latest
 # Issues with XPM cross-compiler on alpine..
-# FROM alpine:latest
 ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT
 ENV XPM_ARM_XCOMPILER_VERSION=$XPM_ARM_XCOMPILER_VERSION_DEFAULT
 
-RUN apt-get update ; \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata; \
-    apt-get install -y npm; \
-    npm install --global xpm@latest; \
+RUN npm install --global xpm@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
 
 # Stage 1
 
@@ -44,3 +37,4 @@ RUN set -ex; \
 
 ENTRYPOINT ["cmake", "--build", "build-freertos"]
 CMD ["-j"]
+# CMD ["bash"]