fsfw/fsfw_example_public
Archived
12
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

some more improvements

Browse Source
This commit is contained in:
Robin Müller 2021-05-21 19:31:05 +02:00
parent 985151c3ed
commit e95ba333a5
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bsp_hosted/Dockerfile
View File

@ -1,8 +1,7 @@
FROM ubuntu:latest FROM ubuntu:latest
# FROM alpine:latest # FROM alpine:latest
RUN apt-get update -y && apt-get upgrade -y RUN apt-get update && apt-get install -y cmake g++
RUN apt-get install -y cmake g++
# RUN apk add cmake make g++ # RUN apk add cmake make g++
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -16,4 +15,4 @@ RUN set -ex; \
ENTRYPOINT ["cmake", "--build", "build-hosted"] ENTRYPOINT ["cmake", "--build", "build-hosted"]
CMD ["-j"] CMD ["-j"]
# CMD ["sh"] # CMD ["bash"]

4
bsp_linux/Dockerfile
View File

@ -1,8 +1,7 @@
FROM ubuntu:latest FROM ubuntu:latest
# FROM alpine:latest # FROM alpine:latest
RUN apt-get update -y && apt-get upgrade -y RUN apt-get update && apt-get install -y cmake g++
RUN apt-get install -y cmake g++
# RUN apk add cmake make g++ # RUN apk add cmake make g++
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -16,3 +15,4 @@ RUN set -ex; \
ENTRYPOINT ["cmake", "--build", "build-linux"] ENTRYPOINT ["cmake", "--build", "build-linux"]
CMD ["-j"] CMD ["-j"]
# CMD ["bash"]

12
bsp_stm32_freertos/Dockerfile
View File

@ -4,20 +4,13 @@ ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT="10.2.1-1.1.2"
# Stage 0 # Stage 0
FROM ubuntu:latest FROM node:latest
# Issues with XPM cross-compiler on alpine.. # Issues with XPM cross-compiler on alpine..
# FROM alpine:latest
ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT ARG XPM_ARM_XCOMPILER_VERSION_DEFAULT
ENV XPM_ARM_XCOMPILER_VERSION=$XPM_ARM_XCOMPILER_VERSION_DEFAULT ENV XPM_ARM_XCOMPILER_VERSION=$XPM_ARM_XCOMPILER_VERSION_DEFAULT
RUN apt-get update ; \ RUN npm install --global xpm@latest; \
DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata; \
apt-get install -y npm; \
npm install --global xpm@latest; \
xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@${XPM_ARM_XCOMPILER_VERSION} 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 # Stage 1
@ -44,3 +37,4 @@ RUN set -ex; \
ENTRYPOINT ["cmake", "--build", "build-freertos"] ENTRYPOINT ["cmake", "--build", "build-freertos"]
CMD ["-j"] CMD ["-j"]
# CMD ["bash"]