Skip to content

Commit

Permalink
Updates to base image, course conents, and gems
Browse files Browse the repository at this point in the history
- Base image is now built from Ubuntu 18.04
- Base image no longer strips out gcc-arm-none-eabi utilities
- Gems updated with Ceedling at 0.29.1
- Latest course project content package
  • Loading branch information
mkarlesky committed Nov 14, 2019
1 parent ca88c0b commit 0af83ba
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 65 deletions.
Binary file modified assets/awesomesauce2.zip
Binary file not shown.
Binary file removed assets/gems/ceedling-0.28.2.gem
Binary file not shown.
Binary file added assets/gems/ceedling-0.29.1.gem
Binary file not shown.
Binary file removed assets/gems/rake-12.3.0.gem
Binary file not shown.
Binary file added assets/gems/rake-13.0.1.gem
Binary file not shown.
Binary file removed assets/gems/thor-0.20.0.gem
Binary file not shown.
Binary file added assets/gems/thor-0.20.3.gem
Binary file not shown.
24 changes: 4 additions & 20 deletions build/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:14.04.5
FROM ubuntu:18.04

MAINTAINER Michael Karlesky <[email protected]>

Expand Down Expand Up @@ -48,13 +48,13 @@ RUN set -ex \


##
## Development environemnt: compiler toolchain & build tools
## 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

# Install Ruby & Ceedling, CMock, Unity
# Install Ruby
RUN set -ex \
# Install apt-add-repository command
&& apt-get update \
Expand All @@ -74,23 +74,7 @@ RUN set -ex \
&& apt-get autoclean all \
&& rm -rf /var/lib/apt/lists/* \
# Unneeded Debconf templates
&& rm /var/cache/debconf/* \
# Thin out arm-none-eabi install, removing tools we don't need
&& rm /usr/bin/arm-none-eabi-addr2line \
&& rm /usr/bin/arm-none-eabi-ar \
&& rm /usr/bin/arm-none-eabi-c++ \
&& rm /usr/bin/arm-none-eabi-c++filt \
&& rm /usr/bin/arm-none-eabi-cpp \
&& rm /usr/bin/arm-none-eabi-elfedit \
&& rm /usr/bin/arm-none-eabi-gcc-ar \
&& rm /usr/bin/arm-none-eabi-gcc-nm \
&& rm /usr/bin/arm-none-eabi-gcc-ranlib \
&& rm /usr/bin/arm-none-eabi-gcov \
&& rm /usr/bin/arm-none-eabi-gprof \
&& rm /usr/bin/arm-none-eabi-ranlib \
&& rm /usr/bin/arm-none-eabi-size \
&& rm /usr/bin/arm-none-eabi-strings \
&& rm /usr/bin/arm-none-eabi-strip
&& rm /var/cache/debconf/*

# When the container launches, drop into a shell
ENTRYPOINT ["/bin/bash"]
Expand Down
11 changes: 4 additions & 7 deletions build/release/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
FROM throwtheswitch/drsurly-course2-base:0.9.0
FROM throwtheswitch/drsurly-course2-base:1.0.0

MAINTAINER Michael Karlesky <[email protected]>


# Update Ubuntu package management environment
# RUN set -ex \
# && apt-get update \
# && apt-get -y upgrade

##
## Copy assets for inclusion in image
##
Expand All @@ -32,4 +27,6 @@ RUN set -ex \

RUN mkdir /lab

# ENTRYPOINT set in base image
# ENTRYPOINT set in base image

WORKDIR /lab
3 changes: 3 additions & 0 deletions build/release/run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker build -t throwtheswitch/drsurly-course2:latest -f build/release/Dockerfile .
35 changes: 0 additions & 35 deletions build/toolchain/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions build/toolchain/run.sh

This file was deleted.

0 comments on commit 0af83ba

Please sign in to comment.