Skip to content

Commit

Permalink
Grab bag of updates
Browse files Browse the repository at this point in the history
1. Fixed omission of gcc and make from base image necessary for DIY mini-project in the course.
2. Updated Ceedling to latest.
3. Latest project archive with DIY fixes and other tweaks from course feedback.
  • Loading branch information
mkarlesky committed Jun 8, 2020
1 parent a070c4c commit 3b1c4eb
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 9 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ Unit testing environment with ARM cross compiler, Unity, CMock, Ceedling, and Qe

## Contents
* Testing tools
* Ceedling 0.29.1
* CMock 2.5.1
* Unity 2.5.0
* Ceedling 0.30.0
* CMock 2.5.2
* Unity 2.5.1
* Environment
* arm-none-eabi-gcc 6.3.1
* Ruby 2.4.9
* make 4.1
* gcc 7.4.0
* arm-none-eabi-gcc 6.3.1
* QEMU 1.1.2 (modified)
* Course project

Expand Down
Binary file modified assets/awesomesauce2.zip
Binary file not shown.
Binary file removed assets/gems/ceedling-0.29.1.gem
Binary file not shown.
Binary file added assets/gems/ceedling-0.30.0.gem
Binary file not shown.
Binary file removed assets/gems/thor-0.20.3.gem
Binary file not shown.
Binary file added assets/gems/thor-1.0.1.gem
Binary file not shown.
10 changes: 6 additions & 4 deletions build/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ COPY assets/qemu assets/qemu
## Custom Qemu for ARM emulation
##

# Install tools needed to build Qemu
# Install tools needed to build Qemu and needed by course mini-projects (e.g. DIY mocking material)
RUN set -ex \
&& apt-get update \
&& apt-get install -y gcc python pkg-config build-essential libglib2.0-dev --no-install-recommends
Expand All @@ -43,16 +43,18 @@ RUN mv /assets/qemu/qemu-stable-1.1/arm-softmmu/qemu-system-arm /usr/local/bin
RUN set -ex \
# Remove Qemu source directory
&& rm -rf /assets \
# Remove packages needed to build Qemu
&& apt-get purge -y --auto-remove gcc python pkg-config build-essential libglib2.0-dev
# Remove packages not needed in the final course environment
&& apt-get purge -y --auto-remove python pkg-config libglib2.0-dev


##
## Development environemnt: compiler toolchain & supporting tools
##

# Install packages needed for ARM-based cross-compiling
RUN apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi libglib2.0-0 --no-install-recommends
RUN set -ex \
&& apt-get update \
&& apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi libglib2.0-0 --no-install-recommends

# Install Ruby
RUN set -ex \
Expand Down
2 changes: 1 addition & 1 deletion build/release/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM throwtheswitch/drsurly-course2-base:1.0.1
FROM throwtheswitch/drsurly-course2-base:1.1.0

MAINTAINER Michael Karlesky <[email protected]>

Expand Down

0 comments on commit 3b1c4eb

Please sign in to comment.