Skip to content

Commit

Permalink
release-2.5: Bump base containers
Browse files Browse the repository at this point in the history
Signed-off-by: Andre Riesco <[email protected]>
  • Loading branch information
andreriesco committed Jun 4, 2024
1 parent fda750c commit 36d1788
Show file tree
Hide file tree
Showing 29 changed files with 44 additions and 45 deletions.
4 changes: 2 additions & 2 deletions cConsole/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions cConsole/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion cConsole/Dockerfile.sdk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmakeConsole/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmakeConsole/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion cmakeConsole/Dockerfile.sdk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions cppConsole/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions cppConsole/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion cppConsole/Dockerfile.sdk
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cppSlint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dotnetUno5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dotnetUno5/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion dotnetUno5FrameBuffer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions dotnetUno5FrameBuffer/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}

Expand Down
3 changes: 1 addition & 2 deletions genericTemplate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_VERSION=3.2.1-bookworm
ARG BASE_VERSION=3.3.0-bookworm

##
# Board architecture
Expand Down Expand Up @@ -34,4 +34,3 @@ WORKDIR ${APP_ROOT}

# Command executed when starting the container
CMD [ "echo", "Generic", "Dockerfile", "Template", "successfully", "executed" ]

2 changes: 1 addition & 1 deletion nodeElectron/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nodeElectron/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nodeJSTypeScript/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
##
# Base container version
##
ARG BASE_VERSION=3.2.1-bookworm
ARG BASE_VERSION=3.3.0-bookworm

##
# Board architecture
Expand Down
2 changes: 1 addition & 1 deletion nodeJSTypeScript/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG IMAGE_ARCH=
##
# Base container version
##
ARG BASE_VERSION=3.2.1-bookworm
ARG BASE_VERSION=3.3.0-bookworm


##
Expand Down
2 changes: 1 addition & 1 deletion python3Console/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python3Console/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python3Pyside2QML/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python3Pyside2QML/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG IMAGE_ARCH=
##
# Base container version
##
ARG BASE_VERSION=3.2.1
ARG BASE_VERSION=3.3.0

##
# Debug port
Expand Down
4 changes: 2 additions & 2 deletions rustConsole/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rustConsole/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rustConsole/Dockerfile.sdk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rustSlint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions zigConsole/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion zigConsole/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 36d1788

Please sign in to comment.