-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates to base image, course conents, and gems
- 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
Showing
12 changed files
with
11 additions
and
65 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]> | ||
|
||
|
@@ -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 \ | ||
|
@@ -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"] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
## | ||
|
@@ -32,4 +27,6 @@ RUN set -ex \ | |
|
||
RUN mkdir /lab | ||
|
||
# ENTRYPOINT set in base image | ||
# ENTRYPOINT set in base image | ||
|
||
WORKDIR /lab |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 . |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.