From 3a92588e37bddfee49301f69cc16fc8614a56e69 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 21 May 2021 18:16:04 +0200
Subject: [PATCH] use ubuntu now

---
 bsp_hosted/Dockerfile         | 2 +-
 bsp_linux/Dockerfile          | 3 +--
 bsp_stm32_freertos/Dockerfile | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bsp_hosted/Dockerfile b/bsp_hosted/Dockerfile
index 7372907..d627677 100644
--- a/bsp_hosted/Dockerfile
+++ b/bsp_hosted/Dockerfile
@@ -1,5 +1,5 @@
-# FROM alpine:latest
 FROM ubuntu:latest
+# FROM alpine:latest
 
 RUN apt-get update -y && apt-get upgrade -y
 RUN apt-get install -y cmake g++
diff --git a/bsp_linux/Dockerfile b/bsp_linux/Dockerfile
index ec6a678..0802e78 100644
--- a/bsp_linux/Dockerfile
+++ b/bsp_linux/Dockerfile
@@ -1,5 +1,5 @@
-# FROM alpine:latest
 FROM ubuntu:latest
+# FROM alpine:latest
 
 RUN apt-get update -y && apt-get upgrade -y
 RUN apt-get install -y cmake g++
@@ -16,4 +16,3 @@ RUN set -ex; \
 
 ENTRYPOINT ["cmake", "--build", "build-linux"]
 CMD ["-j"]
-# CMD ["sh"]
diff --git a/bsp_stm32_freertos/Dockerfile b/bsp_stm32_freertos/Dockerfile
index 362c4a6..beb3214 100644
--- a/bsp_stm32_freertos/Dockerfile
+++ b/bsp_stm32_freertos/Dockerfile
@@ -1,12 +1,13 @@
-# FROM alpine:latest
 FROM ubuntu:latest
+# Issues with XPM cross-compiler on alpine..
+# FROM alpine: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; \
+# RUN apk add cmake make bash npm; \
 #     npm install --global xpm@latest; \
 #     xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest
 
@@ -22,4 +23,3 @@ RUN set -ex; \
 
 ENTRYPOINT ["cmake", "--build", "build-freertos"]
 CMD ["-j"]
-# CMD ["sh"]