From 00d396f88a616b55c9cbb919567ccf86beaf8518 Mon Sep 17 00:00:00 2001 From: Andre Riesco Date: Tue, 4 Jun 2024 12:13:55 -0300 Subject: [PATCH 1/2] release-2.5: Bump base containers Signed-off-by: Andre Riesco --- cConsole/Dockerfile | 4 ++-- cConsole/Dockerfile.debug | 6 +++--- cConsole/Dockerfile.sdk | 2 +- cmakeConsole/Dockerfile | 4 ++-- cmakeConsole/Dockerfile.debug | 6 +++--- cmakeConsole/Dockerfile.sdk | 2 +- cppConsole/Dockerfile | 4 ++-- cppConsole/Dockerfile.debug | 6 +++--- cppConsole/Dockerfile.sdk | 2 +- cppQML/Dockerfile | 4 ++-- cppQML/Dockerfile.debug | 2 +- cppQML/Dockerfile.sdk | 2 +- cppSlint/Dockerfile | 2 +- dotnetUno5/Dockerfile | 2 +- dotnetUno5/Dockerfile.debug | 6 +++--- dotnetUno5FrameBuffer/Dockerfile | 2 +- dotnetUno5FrameBuffer/Dockerfile.debug | 6 +++--- genericTemplate/Dockerfile | 3 +-- nodeElectron/Dockerfile | 2 +- nodeElectron/Dockerfile.debug | 2 +- nodeJSTypeScript/Dockerfile | 2 +- nodeJSTypeScript/Dockerfile.debug | 2 +- python3Console/Dockerfile | 2 +- python3Console/Dockerfile.debug | 2 +- python3Pyside2QML/Dockerfile | 2 +- python3Pyside2QML/Dockerfile.debug | 2 +- rustConsole/Dockerfile | 4 ++-- rustConsole/Dockerfile.debug | 2 +- rustConsole/Dockerfile.sdk | 2 +- rustSlint/Dockerfile | 2 +- zigConsole/Dockerfile | 4 ++-- zigConsole/Dockerfile.debug | 2 +- 32 files changed, 48 insertions(+), 49 deletions(-) diff --git a/cConsole/Dockerfile b/cConsole/Dockerfile index ef8182bd1..d02e464b2 100644 --- a/cConsole/Dockerfile +++ b/cConsole/Dockerfile @@ -1,5 +1,5 @@ -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm -ARG BASE_VERSION=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture # arm or arm64 diff --git a/cConsole/Dockerfile.debug b/cConsole/Dockerfile.debug index 3e9ecbe01..94345e6d5 100644 --- a/cConsole/Dockerfile.debug +++ b/cConsole/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Debug port @@ -90,8 +90,8 @@ RUN mkdir /var/run/sshd && \ RUN rm -r /etc/ssh/ssh*key && \ dpkg-reconfigure openssh-server -# Copy the compiled application to the $APP_ROOT directory path inside the -# container, where $APP_ROOT is the torizon_app_root configuration defined +# Copy the compiled application to the $APP_ROOT directory path inside the +# container, where $APP_ROOT is the torizon_app_root configuration defined # in settings.json COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./build-${IMAGE_ARCH}/debug ${APP_ROOT} diff --git a/cConsole/Dockerfile.sdk b/cConsole/Dockerfile.sdk index 4e05a107c..aba58446d 100644 --- a/cConsole/Dockerfile.sdk +++ b/cConsole/Dockerfile.sdk @@ -1,5 +1,5 @@ # ARGUMENTS -------------------------------------------------------------------- -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm ## # Board architecture diff --git a/cmakeConsole/Dockerfile b/cmakeConsole/Dockerfile index 323c9d5a8..8d4c145da 100644 --- a/cmakeConsole/Dockerfile +++ b/cmakeConsole/Dockerfile @@ -1,5 +1,5 @@ -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm -ARG BASE_VERSION=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture # arm or arm64 diff --git a/cmakeConsole/Dockerfile.debug b/cmakeConsole/Dockerfile.debug index 294f6ba3d..cefdeb88b 100644 --- a/cmakeConsole/Dockerfile.debug +++ b/cmakeConsole/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Debug port @@ -90,8 +90,8 @@ RUN mkdir /var/run/sshd && \ RUN rm -r /etc/ssh/ssh*key && \ dpkg-reconfigure openssh-server -# Copy the compiled application to the $APP_ROOT directory path inside the -# container, where $APP_ROOT is the torizon_app_root configuration defined +# Copy the compiled application to the $APP_ROOT directory path inside the +# container, where $APP_ROOT is the torizon_app_root configuration defined # in settings.json. COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./build-${IMAGE_ARCH}/bin ${APP_ROOT} diff --git a/cmakeConsole/Dockerfile.sdk b/cmakeConsole/Dockerfile.sdk index 7be7795e1..01b54c52b 100644 --- a/cmakeConsole/Dockerfile.sdk +++ b/cmakeConsole/Dockerfile.sdk @@ -1,5 +1,5 @@ # ARGUMENTS -------------------------------------------------------------------- -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm ## # Board architecture diff --git a/cppConsole/Dockerfile b/cppConsole/Dockerfile index 1291b00af..c97d3ad9d 100644 --- a/cppConsole/Dockerfile +++ b/cppConsole/Dockerfile @@ -1,5 +1,5 @@ -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm -ARG BASE_VERSION=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture # arm or arm64 diff --git a/cppConsole/Dockerfile.debug b/cppConsole/Dockerfile.debug index ed6a68d0f..bfb7a5f5d 100644 --- a/cppConsole/Dockerfile.debug +++ b/cppConsole/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Debug port @@ -91,8 +91,8 @@ RUN mkdir /var/run/sshd && \ RUN rm -r /etc/ssh/ssh*key && \ dpkg-reconfigure openssh-server -# Copy the compiled application to the $APP_ROOT directory path inside the -# container, where $APP_ROOT is the torizon_app_root configuration defined +# Copy the compiled application to the $APP_ROOT directory path inside the +# container, where $APP_ROOT is the torizon_app_root configuration defined # in settings.json COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./build-${IMAGE_ARCH}/debug ${APP_ROOT} diff --git a/cppConsole/Dockerfile.sdk b/cppConsole/Dockerfile.sdk index 804be57e6..4c9ae725d 100644 --- a/cppConsole/Dockerfile.sdk +++ b/cppConsole/Dockerfile.sdk @@ -1,5 +1,5 @@ # ARGUMENTS -------------------------------------------------------------------- -ARG CROSS_SDK_BASE_TAG=3.2.1-bookworm +ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm ## # Board architecture diff --git a/cppQML/Dockerfile b/cppQML/Dockerfile index e3d4edadf..efaf64374 100644 --- a/cppQML/Dockerfile +++ b/cppQML/Dockerfile @@ -2,11 +2,11 @@ ## # SDK container version ## -ARG SDK_BASE_VERSION=3 +ARG SDK_BASE_VERSION=3.2.0 ## # Base container version ## -ARG BASE_VERSION=3 +ARG BASE_VERSION=3.2.0 ## # Board architecture diff --git a/cppQML/Dockerfile.debug b/cppQML/Dockerfile.debug index 20ca00a43..c241b0953 100644 --- a/cppQML/Dockerfile.debug +++ b/cppQML/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3 +ARG BASE_VERSION=3.2.0 ## # Debug port diff --git a/cppQML/Dockerfile.sdk b/cppQML/Dockerfile.sdk index dc303f174..5d501f1c1 100644 --- a/cppQML/Dockerfile.sdk +++ b/cppQML/Dockerfile.sdk @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3 +ARG BASE_VERSION=3.2.0 ## # Board GPU vendor prefix diff --git a/cppSlint/Dockerfile b/cppSlint/Dockerfile index 7b561b7d7..1dbfe102b 100644 --- a/cppSlint/Dockerfile +++ b/cppSlint/Dockerfile @@ -4,7 +4,7 @@ # Using Slint v1.5.1 base images ## ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm-1.5.1 -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Board architecture diff --git a/dotnetUno5/Dockerfile b/dotnetUno5/Dockerfile index 6595cadb0..a75df90b0 100644 --- a/dotnetUno5/Dockerfile +++ b/dotnetUno5/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.0.0-8.0 +ARG BASE_VERSION=3.1.0-8.0.2 ## # Directory of the application inside container diff --git a/dotnetUno5/Dockerfile.debug b/dotnetUno5/Dockerfile.debug index 6aff894ee..c69bb8e68 100644 --- a/dotnetUno5/Dockerfile.debug +++ b/dotnetUno5/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.0.0-8.0 +ARG BASE_VERSION=3.1.0-8.0.2 ## # Directory of the application inside container @@ -107,8 +107,8 @@ RUN mkdir /var/run/sshd && \ RUN rm -r /etc/ssh/ssh*key && \ dpkg-reconfigure openssh-server -# Copy the compiled application to the $APP_ROOT directory path inside the -# container, where $APP_ROOT is the torizon_app_root configuration defined +# Copy the compiled application to the $APP_ROOT directory path inside the +# container, where $APP_ROOT is the torizon_app_root configuration defined # in settings.json. COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./__change__.Skia.Gtk/bin/Debug/net8.0/linux-${IMAGE_ARCH}/publish ${APP_ROOT} diff --git a/dotnetUno5FrameBuffer/Dockerfile b/dotnetUno5FrameBuffer/Dockerfile index 7c79c1549..51afd6e09 100644 --- a/dotnetUno5FrameBuffer/Dockerfile +++ b/dotnetUno5FrameBuffer/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.0.0-8.0 +ARG BASE_VERSION=3.1.0-8.0.2 ## # Directory of the application inside container diff --git a/dotnetUno5FrameBuffer/Dockerfile.debug b/dotnetUno5FrameBuffer/Dockerfile.debug index 041dc74cc..b2989070c 100644 --- a/dotnetUno5FrameBuffer/Dockerfile.debug +++ b/dotnetUno5FrameBuffer/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.0.0-8.0 +ARG BASE_VERSION=3.1.0-8.0.2 ## # Directory of the application inside container @@ -107,8 +107,8 @@ RUN mkdir /var/run/sshd && \ RUN rm -r /etc/ssh/ssh*key && \ dpkg-reconfigure openssh-server -# Copy the compiled application to the $APP_ROOT directory path inside the -# container, where $APP_ROOT is the torizon_app_root configuration defined +# Copy the compiled application to the $APP_ROOT directory path inside the +# container, where $APP_ROOT is the torizon_app_root configuration defined # in settings.json. COPY --chown=$SSHUSERNAME:$SSHUSERNAME ./__change__.Skia.Linux.FrameBuffer/bin/Debug/net8.0/linux-${IMAGE_ARCH}/publish ${APP_ROOT} diff --git a/genericTemplate/Dockerfile b/genericTemplate/Dockerfile index 9c1fedba2..408dcaeae 100644 --- a/genericTemplate/Dockerfile +++ b/genericTemplate/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture @@ -34,4 +34,3 @@ WORKDIR ${APP_ROOT} # Command executed when starting the container CMD [ "echo", "Generic", "Dockerfile", "Template", "successfully", "executed" ] - diff --git a/nodeElectron/Dockerfile b/nodeElectron/Dockerfile index f3ef73625..3c01fd82e 100644 --- a/nodeElectron/Dockerfile +++ b/nodeElectron/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Directory of the application inside container diff --git a/nodeElectron/Dockerfile.debug b/nodeElectron/Dockerfile.debug index c4af37ecd..f34e0d3fc 100644 --- a/nodeElectron/Dockerfile.debug +++ b/nodeElectron/Dockerfile.debug @@ -9,7 +9,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Directory of the application inside container diff --git a/nodeJSTypeScript/Dockerfile b/nodeJSTypeScript/Dockerfile index f802b35d5..d8075bb21 100644 --- a/nodeJSTypeScript/Dockerfile +++ b/nodeJSTypeScript/Dockerfile @@ -2,7 +2,7 @@ ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture diff --git a/nodeJSTypeScript/Dockerfile.debug b/nodeJSTypeScript/Dockerfile.debug index 66d1cc9bc..a7639cc48 100644 --- a/nodeJSTypeScript/Dockerfile.debug +++ b/nodeJSTypeScript/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## diff --git a/python3Console/Dockerfile b/python3Console/Dockerfile index 7a75e4e36..b7a2020bd 100644 --- a/python3Console/Dockerfile +++ b/python3Console/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Directory of the application inside container diff --git a/python3Console/Dockerfile.debug b/python3Console/Dockerfile.debug index 9e956f775..9b9261e20 100644 --- a/python3Console/Dockerfile.debug +++ b/python3Console/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Debug port diff --git a/python3Pyside2QML/Dockerfile b/python3Pyside2QML/Dockerfile index 3a8f2acab..a1e8ede56 100644 --- a/python3Pyside2QML/Dockerfile +++ b/python3Pyside2QML/Dockerfile @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Directory of the application inside container diff --git a/python3Pyside2QML/Dockerfile.debug b/python3Pyside2QML/Dockerfile.debug index 706404fbb..917f27527 100644 --- a/python3Pyside2QML/Dockerfile.debug +++ b/python3Pyside2QML/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Debug port diff --git a/rustConsole/Dockerfile b/rustConsole/Dockerfile index 8c7bf4d8d..229eb3072 100644 --- a/rustConsole/Dockerfile +++ b/rustConsole/Dockerfile @@ -2,8 +2,8 @@ ## # Base container version ## -ARG SDK_BASE_VERSION=1.74 -ARG BASE_VERSION=3.2.1-bookworm +ARG SDK_BASE_VERSION=1.78 +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture diff --git a/rustConsole/Dockerfile.debug b/rustConsole/Dockerfile.debug index ac10e3623..b8b435e16 100644 --- a/rustConsole/Dockerfile.debug +++ b/rustConsole/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Directory of the application inside container diff --git a/rustConsole/Dockerfile.sdk b/rustConsole/Dockerfile.sdk index d949a6d37..d45052076 100644 --- a/rustConsole/Dockerfile.sdk +++ b/rustConsole/Dockerfile.sdk @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG SDK_BASE_VERSION=1.74 +ARG SDK_BASE_VERSION=1.78 ## # Directory of the application inside container diff --git a/rustSlint/Dockerfile b/rustSlint/Dockerfile index 3c8a2cb7b..7e53ba476 100644 --- a/rustSlint/Dockerfile +++ b/rustSlint/Dockerfile @@ -4,7 +4,7 @@ # Using Slint v1.5.1 base images ## ARG CROSS_SDK_BASE_TAG=3.3.0-bookworm-1.5.1 -ARG BASE_VERSION=3.2.1 +ARG BASE_VERSION=3.3.0 ## # Board architecture diff --git a/zigConsole/Dockerfile b/zigConsole/Dockerfile index 017f09cb2..b35232aea 100644 --- a/zigConsole/Dockerfile +++ b/zigConsole/Dockerfile @@ -2,8 +2,8 @@ ## # Base container version ## -ARG SDK_BASE_VERSION=3.2.1-bookworm -ARG BASE_VERSION=3.2.1-bookworm +ARG SDK_BASE_VERSION=3.3.0-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Board architecture diff --git a/zigConsole/Dockerfile.debug b/zigConsole/Dockerfile.debug index d33663c98..937c57097 100644 --- a/zigConsole/Dockerfile.debug +++ b/zigConsole/Dockerfile.debug @@ -7,7 +7,7 @@ ARG IMAGE_ARCH= ## # Base container version ## -ARG BASE_VERSION=3.2.1-bookworm +ARG BASE_VERSION=3.3.0-bookworm ## # Directory of the application inside container From 98793e13c273172322c297e695cb56ba1826ad01 Mon Sep 17 00:00:00 2001 From: Andre Riesco Date: Wed, 5 Jun 2024 11:46:29 -0300 Subject: [PATCH 2/2] slint:Add libinput10 install in the Dockerfile as it's required by slint Adding libinput10 dependency installation in the Dockerfile for the Slint templates, as it's required for them, as shown in this commit: https://github.com/commontorizon/Containerfiles/commit/f5587920f0c34b301acbe592b2023f05cda750db Signed-off-by: Andre Riesco --- cppSlint/Dockerfile | 2 +- rustSlint/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cppSlint/Dockerfile b/cppSlint/Dockerfile index 1dbfe102b..2bcfeba4e 100644 --- a/cppSlint/Dockerfile +++ b/cppSlint/Dockerfile @@ -74,7 +74,7 @@ ARG APP_ROOT # Install Slint dependencies RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install libfontconfig1 libxkbcommon0 fonts-noto-core fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji fonts-noto-ui-core fonts-noto-ui-extra \ + && DEBIAN_FRONTEND=noninteractive apt-get install libfontconfig1 libxkbcommon0 libinput10 fonts-noto-core fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji fonts-noto-ui-core fonts-noto-ui-extra \ && rm -rf /var/lib/apt/lists/* # copy Slint library diff --git a/rustSlint/Dockerfile b/rustSlint/Dockerfile index 7e53ba476..d44355501 100644 --- a/rustSlint/Dockerfile +++ b/rustSlint/Dockerfile @@ -96,7 +96,7 @@ RUN apt-get -q -y update && \ # Install Slint dependencies RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install libfontconfig1 libxkbcommon0 fonts-noto-core fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji fonts-noto-ui-core fonts-noto-ui-extra \ + && DEBIAN_FRONTEND=noninteractive apt-get install libfontconfig1 libxkbcommon0 libinput10 fonts-noto-core fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji fonts-noto-ui-core fonts-noto-ui-extra \ && rm -rf /var/lib/apt/lists/* RUN apt-get -y update && apt-get install -y --no-install-recommends \