#56 adding GCC7

Also had to remove qemu (deprecated for Ubuntu 22.04 I guess?) but we weren't using it.

Author: thirtytwobits

README.md

@@ -25,6 +25,7 @@ like [libcanard](https://github.com/OpenCyphal/libcanard) and
 
 | tag      | Python | GCC (native) | GCC (arm-none-eabi) | Clang (native) | Cmake | Host Platforms | Other Utilities |
 |----------|--------|--------------|---------------------|----------------|-------|----------------|-----------------|
+| [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> |
 | [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> |
 | [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> |
 | [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

@@ -25,18 +25,22 @@ FROM base AS provisioning
 WORKDIR /tmp
 ADD kitware-archive-latest.asc .
 ADD pre-provision.sh ./pre-provision.sh
+ADD provision-repositories.sh ./provision-repositories.sh
+ADD provision-repositories-${TARGETARCH}.sh ./provision-repositories-${TARGETARCH}.sh
 ADD provision.sh ./provision.sh
 ADD provision-${TARGETARCH}.sh ./provision-${TARGETARCH}.sh
 ADD post-provision.sh ./post-provision.sh
 
 RUN apt update
 RUN ./pre-provision.sh
+RUN ./provision-repositories.sh
+RUN ./provision-repositories-${TARGETARCH}.sh
 RUN apt update
 RUN ./provision.sh
 RUN ./provision-${TARGETARCH}.sh
 RUN ./post-provision.sh
 
-# INSTALL THE PATH FOR INTERATIVE SESSIONS
+# INSTALL THE PATH FOR INTERACTIVE SESSIONS
 RUN echo "export PATH=$PATH" >> ~/.bashrc
 
 # LEAVE THE WORKDIR AS /repo

toolshed/pre-provision.sh

@@ -28,14 +28,6 @@ apt-get -y install debconf
 apt-get -y install wget
 apt-get -y install gpg
 
-cat kitware-archive-latest.asc
-cat kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-
-apt-get -y install software-properties-common
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
-apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
-add-apt-repository -y ppa:deadsnakes/ppa
-
 # setup locales in the container so Python can default to utf-8.
 apt-get -y install locales
 # from http://jaredmarkell.com/docker-and-locales/

toolshed/provision-arm64.sh

@@ -19,4 +19,5 @@ set -o errexit
 set -o pipefail
 
 # +----------------------------------------------------------+
-echo "No additional packages to install."
+
+apt-get -y install qemu

toolshed/provision-repositories-amd64.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# +----------------------------------------------------------+
+# | BASH : Modifying Shell Behaviour
+# |    (https://www.gnu.org/software/bash/manual)
+# +----------------------------------------------------------+
+# Treat unset variables and parameters other than the special
+# parameters ‘@’ or ‘*’ as an error when performing parameter
+# expansion. An error message will be written to the standard
+# error, and a non-interactive shell will exit.
+set -o nounset
+
+# Exit immediately if a pipeline returns a non-zero status.
+set -o errexit
+
+# If set, the return value of a pipeline is the value of the
+# last (rightmost) command to exit with a non-zero status, or
+# zero if all commands in the pipeline exit successfully.
+set -o pipefail
+
+# +----------------------------------------------------------+
+export DEBIAN_FRONTEND=noninteractive
+
+# For GCC7
+apt-add-repository 'deb http://archive.ubuntu.com/ubuntu/ focal main universe'

toolshed/provision-repositories-arm64.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# +----------------------------------------------------------+
+# | BASH : Modifying Shell Behaviour
+# |    (https://www.gnu.org/software/bash/manual)
+# +----------------------------------------------------------+
+# Treat unset variables and parameters other than the special
+# parameters ‘@’ or ‘*’ as an error when performing parameter
+# expansion. An error message will be written to the standard
+# error, and a non-interactive shell will exit.
+set -o nounset
+
+# Exit immediately if a pipeline returns a non-zero status.
+set -o errexit
+
+# If set, the return value of a pipeline is the value of the
+# last (rightmost) command to exit with a non-zero status, or
+# zero if all commands in the pipeline exit successfully.
+set -o pipefail
+
+# +----------------------------------------------------------+
+export DEBIAN_FRONTEND=noninteractive
+
+# For GCC7
+apt-add-repository 'deb https://ports.ubuntu.com/ubuntu-ports focal main universe'
+

toolshed/provision-repositories.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# +----------------------------------------------------------+
+# | BASH : Modifying Shell Behaviour
+# |    (https://www.gnu.org/software/bash/manual)
+# +----------------------------------------------------------+
+# Treat unset variables and parameters other than the special
+# parameters ‘@’ or ‘*’ as an error when performing parameter
+# expansion. An error message will be written to the standard
+# error, and a non-interactive shell will exit.
+set -o nounset
+
+# Exit immediately if a pipeline returns a non-zero status.
+set -o errexit
+
+# If set, the return value of a pipeline is the value of the
+# last (rightmost) command to exit with a non-zero status, or
+# zero if all commands in the pipeline exit successfully.
+set -o pipefail
+
+# +----------------------------------------------------------+
+export DEBIAN_FRONTEND=noninteractive
+
+cat kitware-archive-latest.asc
+cat kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
+
+apt-get -y install software-properties-common
+apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 16FAAD7AF99A65E2
+apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
+
+add-apt-repository -y ppa:deadsnakes/ppa

toolshed/provision.sh

@@ -33,13 +33,13 @@ apt-get -y install lcov
 apt-get -y install valgrind
 apt-get -y install graphviz
 apt-get -y install curl
-apt-get -y install qemu
 apt-get -y install ninja-build
 apt-get -y install can-utils
 apt-get -y install lsb-release
 apt-get -y install wget
 apt-get -y install gnupg
 apt-get -y install vim
+apt-get -y install g++-7
 apt-get -y install g++-10
 apt-get -y install g++-11
 apt-get -y install g++-12