Skip to content

Commit 3f5304f

Browse files
committed
#56 adding GCC7
Also had to remove qemu (deprecated for Ubuntu 22.04 I guess?) but we weren't using it.
1 parent 11a2413 commit 3f5304f

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ like [libcanard](https://github.com/OpenCyphal/libcanard) and
2525

2626
| tag | Python | GCC (native) | GCC (arm-none-eabi) | Clang (native) | Cmake | Host Platforms | Other Utilities |
2727
|----------|--------|--------------|---------------------|----------------|-------|----------------|-----------------|
28+
| [ts22.4.11](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | 13.3.1 | 18.1.3 | 3.30.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li><li>gcc7</li></ul> |
2829
| [ts22.4.10](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | 13.3.1 | 18.1.3 | 3.30.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li></ul> |
2930
| [ts22.4.8](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | (N/A) | 18.1.3 | 3.22.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li><li>gcc-multilib (amd64 only)</li></ul> |
3031
| [ts22.4.7](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toolshed) | 3.10 | 12.3.0 | (N/A) | 18.1.3 | 3.22.1 | <ul><li>linux/amd64</li><li>linux/arm64</li></ul> | <ul><li>qemu</li><li>can-utils</li><li>doxygen 1.10.0</li><li>nvm</li><li>node 20.x</li><li>nox</li><li>govr</li></ul> |

toolshed/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN ./provision.sh
3636
RUN ./provision-${TARGETARCH}.sh
3737
RUN ./post-provision.sh
3838

39-
# INSTALL THE PATH FOR INTERATIVE SESSIONS
39+
# INSTALL THE PATH FOR INTERACTIVE SESSIONS
4040
RUN echo "export PATH=$PATH" >> ~/.bashrc
4141

4242
# LEAVE THE WORKDIR AS /repo

toolshed/pre-provision.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ cat kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/ki
3333

3434
apt-get -y install software-properties-common
3535
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
36+
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 16FAAD7AF99A65E2
3637
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
38+
apt-add-repository 'deb https://ports.ubuntu.com/ubuntu-ports focal main universe'
3739
add-apt-repository -y ppa:deadsnakes/ppa
3840

3941
# setup locales in the container so Python can default to utf-8.

toolshed/provision.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ apt-get -y install lcov
3333
apt-get -y install valgrind
3434
apt-get -y install graphviz
3535
apt-get -y install curl
36-
apt-get -y install qemu
3736
apt-get -y install ninja-build
3837
apt-get -y install can-utils
3938
apt-get -y install lsb-release
4039
apt-get -y install wget
4140
apt-get -y install gnupg
4241
apt-get -y install vim
42+
apt-get -y install g++-7
4343
apt-get -y install g++-10
4444
apt-get -y install g++-11
4545
apt-get -y install g++-12

0 commit comments

Comments
 (0)