Skip to content

SRE-3874 ci: optimized docker images size #18606

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

Open
grom72 wants to merge 2 commits into
base: master
Choose a base branch
from
+310 −195
Open

SRE-3874 ci: optimized docker images size #18606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0211262
SRE-3874 ci: Reduce CI Docker image footprint
grom72 Jul 2, 2026
85c060b
Extend solution to Leap 15 Dockers
grom72 Jul 7, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/ci2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,23 @@ jobs:
--build-arg BASE_DISTRO
--build-arg DAOS_JAVA_BUILD=yes
--build-arg COMPILER
--target build-local
- name: Build debug in docker.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER
--target build-local
- name: Build devel in docker.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER
--target build-local

# Should work, but enable on master only for now.
# - name: Run NLT
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/landing-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,14 @@ jobs:
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--target build-local
- name: Build dependencies in Docker
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DAOS_BUILD=no
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--target build-local
- name: Prune images not required for build.
run: docker images --all --filter label=DAOS=true --quiet | xargs docker rmi --no-prune

Expand Down Expand Up @@ -227,6 +229,7 @@ jobs:
--build-arg PYTHON_VERSION
--build-arg DAOS_JAVA_BUILD=yes
--build-arg COMPILER
--target build-local
- name: Build debug in docker.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -235,6 +238,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER
--target build-local
- name: Build devel in docker.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -243,6 +247,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER
--target build-local
# Fails with Ubuntu still for the spdk issue.
# - name: Run NLT
# run: docker run --mount type=tmpfs,destination=/mnt/daos_0,tmpfs-mode=1777
Expand Down Expand Up @@ -289,6 +294,7 @@ jobs:
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--build-arg DAOS_BUILD=no
--target build-local
- name: Build in docker with clang
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -305,6 +311,7 @@ jobs:
--build-arg PYTHON_VERSION
--build-arg DAOS_JAVA_BUILD=yes
--build-arg COMPILER=clang
--target build-local
- name: Build debug in docker with clang.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -313,6 +320,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER=clang
--target build-local
- name: Build devel in docker with clang
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -321,13 +329,15 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER=clang
--target build-local
- name: Build in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--build-arg DAOS_JAVA_BUILD=no
--build-arg COMPILER=gcc
--target build-local
- name: Build debug in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -336,6 +346,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER=gcc
--target build-local
- name: Build devel in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -344,6 +355,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER=gcc
--target build-local
- name: Run NLT
run: docker run --mount type=tmpfs,destination=/mnt/daos_0,tmpfs-mode=1777 --user root:root
build-image ./daos/utils/node_local_test.py --no-root
Expand Down Expand Up @@ -390,6 +402,7 @@ jobs:
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--build-arg DAOS_BUILD=no
--target build-local
- name: Build in docker with clang
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -406,6 +419,7 @@ jobs:
--build-arg PYTHON_VERSION
--build-arg DAOS_JAVA_BUILD=yes
--build-arg COMPILER=clang
--target build-local
- name: Build debug in docker with clang.
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -414,6 +428,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER=clang
--target build-local
- name: Build devel in docker with clang
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -422,13 +437,15 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER=clang
--target build-local
- name: Build in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
--build-arg BASE_DISTRO
--build-arg PYTHON_VERSION
--build-arg DAOS_JAVA_BUILD=no
--build-arg COMPILER=gcc
--target build-local
- name: Build debug in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -437,6 +454,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=debug
--build-arg COMPILER=gcc
--target build-local
- name: Build devel in docker with gcc
run: docker build . --file utils/docker/Dockerfile.${{ matrix.base }}
--build-arg DEPS_JOBS
Expand All @@ -445,6 +463,7 @@ jobs:
--build-arg DAOS_JAVA_BUILD=no
--build-arg DAOS_BUILD_TYPE=dev
--build-arg COMPILER=gcc
--target build-local
- name: Run NLT
run: docker run --mount type=tmpfs,destination=/mnt/daos_0,tmpfs-mode=1777 --user root:root
build-image ./daos/utils/node_local_test.py --no-root
Expand Down
7 changes: 2 additions & 5 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,7 @@ pipeline {
deps_build: false,
parallel_build: true) +
" -t ${sanitized_JOB_NAME()}-el9 " +
' --build-arg DAOS_PACKAGES_BUILD=no ' +
' --build-arg DAOS_KEEP_SRC=yes ' +
' --target build-ci' +
' --build-arg REPOS="' + prRepos() + '"' +
' --build-arg POINT_RELEASE=.7' +
" --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}"
Expand Down Expand Up @@ -970,10 +969,8 @@ pipeline {
additionalBuildArgs dockerBuildArgs(repo_type: 'stable',
parallel_build: true,
deps_build: false) +
' --build-arg DAOS_PACKAGES_BUILD=no ' +
' --build-arg DAOS_KEEP_SRC=yes ' +
" -t ${sanitized_JOB_NAME()}-leap15-gcc" +
" -t ${sanitized_JOB_NAME()}-leap15" +
' --target build-ci' +
' --build-arg POINT_RELEASE=.6' +
" --build-arg PYTHON_VERSION=${env.PYTHON_VERSION}"
}
Expand Down
1 change: 0 additions & 1 deletion ci/rpm/build_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/bash
cd /home/daos/pre || exit 1
scons install --build-deps=only USE_INSTALLED=all PREFIX=/opt/daos TARGET_TYPE=release -j 32
2 changes: 1 addition & 1 deletion utils/docker/Dockerfile.el.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN chmod +x /tmp/repo-helper.sh /tmp/install.sh && \
/tmp/repo-helper.sh && \
rm -f /tmp/repo-helper.sh

FROM basic
FROM basic AS build-local
Comment thread
grom72 marked this conversation as resolved.
Dismissed
# Install OS updates and package. Include basic tools and daos dependencies
# The proxy variables are currently needed for the combination of running
# with a local repository, yet needing a proxy to reach outside repositories.
Expand Down
Loading
Loading