use ubuntu now

This commit is contained in:
Robin Müller 2021-05-21 18:16:04 +02:00
parent 190fabc081
commit 3a92588e37
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 5 additions and 6 deletions

View File

@ -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++

View File

@ -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"]

View File

@ -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"]