Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

update docker container images

Browse source 
Signed-off-by: Philipp Jungkamp <Philipp.Jungkamp@opal-rt.com>
This commit is contained in:
Philipp Jungkamp 2023-06-16 15:22:15 +02:00
parent 9916a6b3d2
commit 1baeb2738a
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -77,6 +77,9 @@ find_package(spdlog)
find_package(Etherlab) find_package(Etherlab)
find_package(Lua) find_package(Lua)
# For compat between libfmt 8 and 9
add_compile_definitions(FMT_DEPRECATED_OSTREAM)
# Check for tools # Check for tools
find_program(PASTE NAMES paste) find_program(PASTE NAMES paste)
if(NOT PASTE) if(NOT PASTE)

5
packaging/deps.sh
View file

@ -303,15 +303,14 @@ if ! pkg-config "spdlog >= 1.8.2" && \
fi fi
# Build & Install libwebsockets # Build & Install libwebsockets
if ! pkg-config "libwebsockets >= 3.1.0" && \ if ! pkg-config "libwebsockets >= 4.3.0" && \
[ -z "${SKIP_WEBSOCKETS}" ]; then [ -z "${SKIP_WEBSOCKETS}" ]; then
git clone ${GIT_OPTS} --branch v4.0-stable https://libwebsockets.org/repo/libwebsockets git clone ${GIT_OPTS} --branch v4.3-stable https://github.com/warmcat/libwebsockets
mkdir -p libwebsockets/build mkdir -p libwebsockets/build
pushd libwebsockets/build pushd libwebsockets/build
cmake -DLWS_WITH_IPV6=ON \ cmake -DLWS_WITH_IPV6=ON \
-DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_TESTAPPS=ON \
-DLWS_WITHOUT_EXTENSIONS=OFF \ -DLWS_WITHOUT_EXTENSIONS=OFF \
-DLWS_WITH_SERVER_STATUS=ON \
${CMAKE_OPTS} .. ${CMAKE_OPTS} ..
make ${MAKE_OPTS} install make ${MAKE_OPTS} install
popd popd

2
packaging/docker/Dockerfile.debian
View file

@ -7,7 +7,7 @@
# You can choose between Debian and Ubuntu here # You can choose between Debian and Ubuntu here
ARG DISTRO=debian ARG DISTRO=debian
ARG DEBIAN_VERSION=bullseye ARG DEBIAN_VERSION=bookworm
FROM ${DISTRO}:${DEBIAN_VERSION} AS dev FROM ${DISTRO}:${DEBIAN_VERSION} AS dev

2
packaging/docker/Dockerfile.fedora-minimal
View file

@ -6,7 +6,7 @@
################################################################################### ###################################################################################
ARG DISTRO=fedora ARG DISTRO=fedora
ARG FEDORA_VERSION=34 ARG FEDORA_VERSION=36
FROM ${DISTRO}:${FEDORA_VERSION} AS dev FROM ${DISTRO}:${FEDORA_VERSION} AS dev

8
packaging/docker/Dockerfile.rocky
View file

@ -6,7 +6,7 @@
################################################################################### ###################################################################################
ARG DISTRO=rockylinux ARG DISTRO=rockylinux
ARG ROCKY_VERSION=8 ARG ROCKY_VERSION=9
FROM ${DISTRO}:${ROCKY_VERSION} AS dev FROM ${DISTRO}:${ROCKY_VERSION} AS dev
@ -16,13 +16,13 @@ USER root
# Enable Extra Packages for Enterprise Linux (EPEL) repo and PowerTools # Enable Extra Packages for Enterprise Linux (EPEL) repo and PowerTools
RUN dnf -y install epel-release dnf-plugins-core RUN dnf -y install epel-release dnf-plugins-core
RUN dnf config-manager --set-enabled powertools RUN dnf config-manager --set-enabled crb
# Toolchain # Toolchain
RUN dnf -y install \ RUN dnf --allowerasing -y install \
gcc gcc-c++ \ gcc gcc-c++ \
pkgconfig cmake make \ pkgconfig cmake make \
autoconf automake autogen libtool \ autoconf automake libtool \
flex bison \ flex bison \
texinfo git curl tar \ texinfo git curl tar \
protobuf-compiler protobuf-c-compiler protobuf-compiler protobuf-c-compiler

2
packaging/docker/Dockerfile.ubuntu
View file

@ -7,7 +7,7 @@
# You can choose between Debian and Ubuntu here # You can choose between Debian and Ubuntu here
ARG DISTRO=ubuntu ARG DISTRO=ubuntu
ARG UBUNTU_VERSION=20.04 ARG UBUNTU_VERSION=22.04
ARG DISTRO=${DISTRO} ARG DISTRO=${DISTRO}
FROM ${DISTRO}:${UBUNTU_VERSION} AS dev FROM ${DISTRO}:${UBUNTU_VERSION} AS dev