Skip to content

Commit

Permalink
Add mksquashfs to current images
Browse files Browse the repository at this point in the history
Purpose: Be able to upload compressed coredumps and installation images
Signed-off-by: Marcus Müller <[email protected]>
  • Loading branch information
marcusmueller committed Jan 24, 2025
1 parent cea373c commit 345aa98
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 21 deletions.
33 changes: 18 additions & 15 deletions ci/ci-debian-12-3.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@ LABEL maintainer="[email protected]"

ENV security_updates_as_of 2024-05-17

ARG APT_INSTALL_COMMAND="apt-get install -qy --no-install-recommends"
ENV DEBIAN_FRONTEND=noninteractive

# Prepare distribution
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update -q ;\
DEBIAN_FRONTEND=noninteractive \
apt-get -y upgrade \
&& DEBIAN_FRONTEND=noninteractive \
apt-get -qy install ca-certificates \
RUN \
apt-get update -q ;\
apt-get -y upgrade \
&& ${APT_INSTALL_COMMAND} \
ca-certificates \
&& apt-get clean \
&& apt-get autoclean

# CPP / base dev deps
RUN DEBIAN_FRONTEND=noninteractive \
apt-get install -qy \
--no-install-recommends \
RUN \
apt-get update -q ;\
${APT_INSTALL_COMMAND} \
\
build-essential \
ccache \
Expand Down Expand Up @@ -82,9 +84,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
&& apt-get autoclean

# Py3 deps
RUN DEBIAN_FRONTEND=noninteractive \
apt-get install -qy \
--no-install-recommends \
RUN \
${APT_INSTALL_COMMAND} \
python3-click \
python3-click-plugins \
python3-dev \
Expand All @@ -104,12 +105,14 @@ RUN DEBIAN_FRONTEND=noninteractive \
&& apt-get autoclean

# Testing deps
RUN DEBIAN_FRONTEND=noninteractive \
apt-get install -qy \
RUN \
${APT_INSTALL_COMMAND} \
xvfb \
lcov \
python3-scipy \
clang-format \
--no-install-recommends \
# for bundling up results
squashfs-tools \
&& apt-get clean \
&& apt-get autoclean

2 changes: 2 additions & 0 deletions ci/ci-fedora-41-3.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ RUN ${DNF_COMMAND} install --refresh -y \
zsh \
# For hash checking and libad9361 building
git \
# For bundling up results
squashfs-tools \
&& ${DNF_COMMAND} clean all
# Install libad9361
RUN mkdir -p /src/build \
Expand Down
17 changes: 11 additions & 6 deletions ci/ci-ubuntu-24.04-3.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
FROM ubuntu:24.04
LABEL maintainer="[email protected]"

ENV security_updates_as_of 2024-05-27
ENV security_updates_as_of 2025-01-24

ARG APT_INSTALL_COMMAND="apt-get install -qy --no-install-recommends"
ENV DEBIAN_FRONTEND=noninteractive

# Prepare distribution
RUN sed -i 's/Types: deb/& deb-src/' /etc/apt/sources.list.d/ubuntu.sources \
&& apt-get update -q \
&& apt-get -y upgrade \
&& apt-get clean && apt-get autoclean
&& apt-get update -q \
&& apt-get -y upgrade \
&& apt-get clean && apt-get autoclean

RUN DEBIAN_FRONTEND=noninteractive \
apt-get install -qy --no-install-recommends \
RUN \
${APT_INSTALL_COMMAND} \
appstream-util \
ca-certificates \
ccache \
Expand All @@ -20,5 +23,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
lcov \
pkg-config \
xvfb \
# for bundling up results
squashfs-tools \
&& apt-get build-dep -qy gnuradio \
&& apt-get clean && apt-get autoclean

0 comments on commit 345aa98

Please sign in to comment.