Skip to content

[CI] Dockers minor changes #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 11, 2025
Merged

[CI] Dockers minor changes #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
626ddef
[CI] Add pkg-config in one of Ubuntu docker
lukaszstolarczuk Jul 9, 2025
ff02166
[CI] Get rid of warnings in dockers using preffered ENV format
lukaszstolarczuk Jul 9, 2025
caf7b14
[CI] add libtool to Ubu 24.04 as well, plus fix the comment
lukaszstolarczuk Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/docker/ubuntu-20.04.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="\
Expand Down Expand Up @@ -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
18 changes: 10 additions & 8 deletions .github/docker/ubuntu-22.04.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
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
# 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 \
Expand All @@ -37,10 +36,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"
Expand All @@ -63,7 +65,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
14 changes: 8 additions & 6 deletions .github/docker/ubuntu-24.04.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
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
# 'libtool' is required when hwloc is statically linked and built from source
ARG BASE_DEPS="\
build-essential \
cmake \
git \
libtool \
wget"

# UMF's dependencies
Expand Down Expand Up @@ -60,7 +62,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
Loading