From 747f0ede13366b7ad5027d8c1249cb169a3854bc Mon Sep 17 00:00:00 2001 From: Leonardo Carreras Date: Tue, 4 Feb 2025 10:49:08 +0000 Subject: [PATCH] Update container file for Ubuntu bumping to 24.04 Signed-off-by: Leonardo Carreras --- packaging/docker/Dockerfile.ubuntu | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 38f660350..22dbd2b8e 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -6,7 +6,7 @@ # You can choose between Debian and Ubuntu here ARG DISTRO=ubuntu -ARG UBUNTU_VERSION=22.04 +ARG UBUNTU_VERSION=24.04 ARG DISTRO=${DISTRO} FROM ${DISTRO}:${UBUNTU_VERSION} AS dev @@ -24,7 +24,10 @@ RUN apt-get update && \ texinfo git curl tar wget diffutils \ flex bison \ protobuf-compiler protobuf-c-compiler \ - clang-format clangd + clang-format clangd \ + python3-venv \ + ninja-build mercurial \ + xmlto udev # Dependencies RUN apt-get update && \ @@ -53,7 +56,10 @@ RUN apt-get update && \ liblua5.3-dev \ libhiredis-dev \ libnice-dev \ - libmodbus-dev + libmodbus-dev \ + libre2-dev \ + libglib2.0-0 libglib2.0-dev \ + libcriterion-dev # Add local and 64-bit locations to linker paths ENV echo /usr/local/lib >> /etc/ld.so.conf && \ @@ -93,7 +99,7 @@ LABEL \ org.label-schema.vendor="Institute for Automation of Complex Power Systems, RWTH Aachen University" \ org.label-schema.author.name="Steffen Vogel" \ org.label-schema.author.email="post@steffenvogel.de" \ - org.label-schema.description="A image containing all build-time dependencies for VILLASnode based on Fedora" \ + org.label-schema.description="An image containing all build-time dependencies for VILLASnode based on Ubuntu" \ org.label-schema.url="http://fein-aachen.org/projects/villas-framework/" \ org.label-schema.vcs-url="https://git.rwth-aachen.de/acs/public/villas/node" \ org.label-schema.usage="https://villas.fein-aachen.org/doc/node-installation.html#node-installation-docker"