Skip to content

Commit f45b4d0

Browse files
committed
add coverage bundle to debian
The debian container is also used to run codecov which depends additionally to curl and gnupg. Thus create a new bundle to properly document this. Signed-off-by: Daniel Wagner <wagi@kernel.org>
1 parent a2e5e6d commit f45b4d0

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ staging-dockerfiles: $(STAGING_DOCKERFILES)
3131

3232
main/Dockerfile.%: ci-containers.yaml generate.py templates/Dockerfile.%.j2
3333
@if [ "$*" = "debian" ]; then \
34-
./generate.py --distro $* --bundles base,muon,musl,python --features muon --output $@; \
34+
./generate.py --distro $* --bundles base,muon,musl,coverage,python --features muon --output $@; \
3535
else \
3636
./generate.py --distro $* --bundles base,muon,python --features muon --output $@; \
3737
fi

ci-containers.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,18 @@ bundles:
8787
- musl-dev
8888
- musl-tools
8989

90+
coverage:
91+
debian:
92+
- curl
93+
- gnupg
94+
- pipx
95+
9096
python:
9197
debian:
9298
- python3
9399
- python3-dev
94100
- python3-pip
95101
- python3-venv
96-
- pipx
97102
fedora:
98103
- python3
99104
- python3-devel

main/Dockerfile.debian

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ RUN apt-get update && \
3333
musl \
3434
musl-dev \
3535
musl-tools \
36+
curl \
37+
gnupg \
38+
pipx \
3639
python3 \
3740
python3-dev \
3841
python3-pip \
3942
python3-venv \
40-
pipx \
4143
&& apt-get clean && \
4244
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
4345

0 commit comments

Comments
 (0)