From 626ddefb3861e7ac624ba3d7245dceb4fbb09d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Wed, 9 Jul 2025 17:18:43 +0200 Subject: [PATCH 1/3] [CI] Add pkg-config in one of Ubuntu docker to test finding packages in CMake using it. --- .github/docker/ubuntu-22.04.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/docker/ubuntu-22.04.Dockerfile b/.github/docker/ubuntu-22.04.Dockerfile index 915d92c26..e2e8d7cae 100644 --- a/.github/docker/ubuntu-22.04.Dockerfile +++ b/.github/docker/ubuntu-22.04.Dockerfile @@ -37,10 +37,13 @@ ARG TEST_DEPS="\ valgrind" # Miscellaneous for our builds/CI (optional) +# 'pkg-config' is added only on one Ubuntu image to test both: +# find_library and pkg-config methods of finding libraries. ARG MISC_DEPS="\ automake \ clang \ lcov \ + pkg-config \ python3-pip \ sudo \ whois" From ff02166726dbca2eee4b20925798bbed42e5b294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Wed, 9 Jul 2025 17:30:46 +0200 Subject: [PATCH 2/3] [CI] Get rid of warnings in dockers using preffered ENV format --- .github/docker/ubuntu-20.04.Dockerfile | 12 ++++++------ .github/docker/ubuntu-22.04.Dockerfile | 12 ++++++------ .github/docker/ubuntu-24.04.Dockerfile | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/docker/ubuntu-20.04.Dockerfile b/.github/docker/ubuntu-20.04.Dockerfile index 8869303b7..9de50673f 100644 --- a/.github/docker/ubuntu-20.04.Dockerfile +++ b/.github/docker/ubuntu-20.04.Dockerfile @@ -11,10 +11,10 @@ FROM registry.hub.docker.com/library/ubuntu@sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8 # Set environment variables -ENV OS ubuntu -ENV OS_VER 20.04 -ENV NOTTY 1 -ENV DEBIAN_FRONTEND noninteractive +ENV OS=ubuntu +ENV OS_VER=20.04 +ENV NOTTY=1 +ENV DEBIAN_FRONTEND=noninteractive # Base development packages ARG BASE_DEPS="\ @@ -65,7 +65,7 @@ RUN mkdir -p --mode 777 /opt/umf/ COPY third_party/requirements.txt /opt/umf/requirements.txt # Add a new (non-root) 'test_user' -ENV USER test_user -ENV USERPASS pass +ENV USER=test_user +ENV USERPASS=pass RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})" USER test_user diff --git a/.github/docker/ubuntu-22.04.Dockerfile b/.github/docker/ubuntu-22.04.Dockerfile index e2e8d7cae..de38d303f 100644 --- a/.github/docker/ubuntu-22.04.Dockerfile +++ b/.github/docker/ubuntu-22.04.Dockerfile @@ -11,10 +11,10 @@ FROM registry.hub.docker.com/library/ubuntu@sha256:e6173d4dc55e76b87c4af8db8821b1feae4146dd47341e4d431118c7dd060a74 # Set environment variables -ENV OS ubuntu -ENV OS_VER 22.04 -ENV NOTTY 1 -ENV DEBIAN_FRONTEND noninteractive +ENV OS=ubuntu +ENV OS_VER=22.04 +ENV NOTTY=1 +ENV DEBIAN_FRONTEND=noninteractive # Base development packages # It seems that libtool is not directly needed @@ -66,7 +66,7 @@ COPY third_party/requirements.txt /opt/umf/requirements.txt RUN pip3 install --no-cache-dir -r /opt/umf/requirements.txt # Add a new (non-root) 'test_user' -ENV USER test_user -ENV USERPASS pass +ENV USER=test_user +ENV USERPASS=pass RUN useradd -m -u 1001 "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})" USER test_user diff --git a/.github/docker/ubuntu-24.04.Dockerfile b/.github/docker/ubuntu-24.04.Dockerfile index e56338ab9..45c5c2eb2 100644 --- a/.github/docker/ubuntu-24.04.Dockerfile +++ b/.github/docker/ubuntu-24.04.Dockerfile @@ -11,10 +11,10 @@ FROM registry.hub.docker.com/library/ubuntu@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 # Set environment variables -ENV OS ubuntu -ENV OS_VER 24.04 -ENV NOTTY 1 -ENV DEBIAN_FRONTEND noninteractive +ENV OS=ubuntu +ENV OS_VER=24.04 +ENV NOTTY=1 +ENV DEBIAN_FRONTEND=noninteractive # Base development packages ARG BASE_DEPS="\ @@ -60,7 +60,7 @@ COPY third_party/requirements.txt /opt/umf/requirements.txt RUN pip3 install --no-cache-dir --break-system-packages -r /opt/umf/requirements.txt # Add a new (non-root) 'test_user' -ENV USER test_user -ENV USERPASS pass +ENV USER=test_user +ENV USERPASS=pass RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})" USER test_user From caf7b14a93af79c0a7afc023acafd3e34219f881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Thu, 10 Jul 2025 12:45:13 +0200 Subject: [PATCH 3/3] [CI] add libtool to Ubu 24.04 as well, plus fix the comment --- .github/docker/ubuntu-22.04.Dockerfile | 3 +-- .github/docker/ubuntu-24.04.Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/docker/ubuntu-22.04.Dockerfile b/.github/docker/ubuntu-22.04.Dockerfile index de38d303f..748a2d544 100644 --- a/.github/docker/ubuntu-22.04.Dockerfile +++ b/.github/docker/ubuntu-22.04.Dockerfile @@ -17,8 +17,7 @@ ENV NOTTY=1 ENV DEBIAN_FRONTEND=noninteractive # Base development packages -# It seems that libtool is not directly needed -# but it is still required when Building UMF +# 'libtool' is required when hwloc is statically linked and built from source ARG BASE_DEPS="\ build-essential \ cmake \ diff --git a/.github/docker/ubuntu-24.04.Dockerfile b/.github/docker/ubuntu-24.04.Dockerfile index 45c5c2eb2..21e7f0160 100644 --- a/.github/docker/ubuntu-24.04.Dockerfile +++ b/.github/docker/ubuntu-24.04.Dockerfile @@ -17,10 +17,12 @@ ENV NOTTY=1 ENV DEBIAN_FRONTEND=noninteractive # Base development packages +# 'libtool' is required when hwloc is statically linked and built from source ARG BASE_DEPS="\ build-essential \ cmake \ git \ + libtool \ wget" # UMF's dependencies