docker/debian: Add gcc++13 to devtools

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

docker/linux/debian/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim@sha256:779034981fec838da124ff6ab9211499ba5d4e769dabdfd6c42c6ae2553b9a3b AS worker-base
+FROM debian:trixie-slim@sha256:779034981fec838da124ff6ab9211499ba5d4e769dabdfd6c42c6ae2553b9a3b AS worker-base
 ARG DEBIAN_FRONTEND=noninteractive
 SHELL ["/bin/bash", "-ec"]
 RUN --mount=type=tmpfs,target=/var/cache/apt \

docker/linux/debian/fun.sh

@@ -5,7 +5,6 @@ set -o pipefail
 # shellcheck source=docker/linux/common_fun.sh
 . ./common_fun.sh
 
-
 # Mobile and repo variables
 APT_KEYS_MOBILE=(
     "$APT_KEY_AZUL")
@@ -26,6 +25,7 @@ DEBIAN_PACKAGES=(
     docker-ce-cli
     doxygen
     expect
+    g++-13
     gdb
     git
     graphviz
@@ -45,7 +45,8 @@ DEBIAN_PACKAGES=(
     tshark
     unzip
     xz-utils
-    zip)
+    zip
+    yq)
 DOCKER_PACKAGES=(
     containerd.io
     docker-buildx-plugin
@@ -58,7 +59,8 @@ DOCKER_PACKAGES=(
     jq
     netcat-openbsd
     skopeo
-    whois)
+    whois
+    yq)
 GROUP_ID="${GROUP_ID:-${USER_ID:-1000}}"
 USER_ID="${USER_ID:-1000}"
 USER_NAME="${USER_NAME:-envoybuild}"
@@ -161,8 +163,8 @@ install_devel () {
     LSB_RELEASE="$(lsb_release -cs)"
     APT_REPOS=(
         "[arch=${DEB_ARCH}] https://download.docker.com/linux/debian ${LSB_RELEASE} stable"
-        "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_11/ /")
-
+        "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_11/ /"
+        "http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu  ${LSB_RELEASE} main")
     apt-get -qq install -y --no-install-recommends wget gnupg2 gpg-agent software-properties-common
     add_apt_key "${APT_KEY_DOCKER}"
     add_apt_k8s_key "${APT_KEY_K8S}"
@@ -172,6 +174,10 @@ install_devel () {
     apt-get -qq update
     apt-get -qq upgrade -y
 
+    apt_install "${DEV_PACKAGES[@]}"
+    apt-get -qq dist-upgrade -y
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 1
+
     install_build
 
     echo "Development tools installation completed - compilers provided by toolchains"
@@ -197,16 +203,14 @@ install_docker () {
     fi
     LSB_RELEASE="$(lsb_release -cs)"
     APT_REPOS=(
-        "http://archive.debian.org/debian bullseye-backports main"
         "[arch=${DEB_ARCH}] https://download.docker.com/linux/debian ${LSB_RELEASE} stable"
-        "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_11/ /")
+        "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_Testing/ /")
     apt-get -qq install -y --no-install-recommends wget gnupg2 gpg-agent software-properties-common
     add_apt_key "${APT_KEY_DOCKER}"
     add_apt_k8s_key "${APT_KEY_K8S}"
     add_apt_repos "${APT_REPOS[@]}"
     apt-get -qq update
     apt-get -qq install -y --no-install-recommends "${DOCKER_PACKAGES[@]}"
-    apt-get -qq install -y --no-install-recommends -t bullseye-backports curl yq
     apt-get -qq update
     apt-get -qq upgrade -y
 }