8000 Cache the apt cache of the Docker build by Spacetown · Pull Request #878 · gcovr/gcovr · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Cache the apt cache of the Docker build #878

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
Feb 3, 2024
Merged

Cache the apt cache of the Docker build #878

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
86f6231
Cache the apt cache
Spacetown Feb 3, 2024
a04e720
Use heredocs fro better readability
Spacetown Feb 3, 2024
cc87fd2
Update CHANGELOG
Spacetown Feb 3, 2024
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
17 changes: 17 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
.. program is needed to resolve option links
.. program:: gcovr

Next Release
------------

Known bugs:

Breaking changes:

New features and notable changes:

Bug fixes and small improvements:

Documentation:

Internal changes:

- Improve Dockerfile for faster rebuilds by using cache. (:issue:`878`)

7.0 (25 January 2024)
---------------------

Expand Down
121 changes: 59 additions & 62 deletions admin/Dockerfile.qa
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,56 @@ ARG CC
ARG CXX
ARG NOX_ENV_DIR=/gcovr/.nox-containerized.$CC.uid_$USERID


RUN --mount=type=cache,target=/var/cache/apt <<EOS
set -e
export DEBIAN_FRONTEND=noninteractive
apt-get update
# Install base requirements
RUN \
export DEBIAN_FRONTEND=noninteractive&& apt-get update \
&& apt-get install -y sudo \
make \
cmake \
$CC \
$CXX \
ninja-build \
curl \
libxml2-utils \
git
apt-get install -y sudo \
make \
cmake \
$CC \
$CXX \
ninja-build \
curl \
libxml2-utils \
git

# Install Python 3.8 as the default "python3" executable on older linux distribution
RUN \
export DEBIAN_FRONTEND=noninteractive&& apt install -y python3-setuptools ;\
if [ "$DOCKER_OS" = "ubuntu:18.04" -o "$DOCKER_OS" = "ubuntu:20.04" ]; then \
export DEBIAN_FRONTEND=noninteractive&& apt install -y software-properties-common || exit 1; \
add-apt-repository ppa:deadsnakes/ppa || exit 1 ; \
apt-get update || exit 1 ; \
export DEBIAN_FRONTEND=noninteractive&& apt install -y python3.8-dev python3.8-venv python3.8 || exit 1 ; \
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 10 || exit 1 ; \
else \
export DEBIAN_FRONTEND=noninteractive&& apt-get install -y \
python3-venv \
$(if [ "$DOCKER_OS" != "ubuntu:23.04" ]; then echo "python3-dev"; fi) \
$(if [ "$DOCKER_OS" = "ubuntu:23.04" ]; then echo "python3-full python3-pip python3-nox"; fi) || exit 1 ; \
fi ; \
python3 --version

RUN \
export DEBIAN_FRONTEND=noninteractive&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
apt install -y python3-setuptools
if [ "$DOCKER_OS" = "ubuntu:18.04" -o "$DOCKER_OS" = "ubuntu:20.04" ]; then
apt install -y software-properties-common
add-apt-repository ppa:deadsnakes/ppa
apt-get update
apt install -y python3.8-dev python3.8-venv python3.8
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 10
else
apt-get install -y \
python3-venv \
$(if [ "$DOCKER_OS" = "ubuntu:23.04" ]; then echo "python3-full"; else echo "python3-dev"; fi)
fi
python3 --version

# Install dependencies.
#
# Installing pip is a bit more complicated though:
# * `apt install python3-pip` -> pulls in >100MB of unneeded stuff
# * `get-pip.py` script -> depends on distutils standard library module, removed by Debian
#
# Solution: install python3-setuptools (includes Python 3.6),
# then use the get-pip script from Python 3.7.

# Install pip manually
RUN if [ "$DOCKER_OS" != "ubuntu:23.04" ]; then \
curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py || exit 1 ; \
python3 get-pip.py || exit 1 ; \
rm get-pip.py || exit 1 ; \
python3 -m pip install --upgrade pip || exit 1 ; \
fi ;
# Install pip and nox
if [ "$DOCKER_OS" = "ubuntu:23.04" ]; then
apt-get install -y python3-pip python3-nox
else
# Install dependencies.
#
# Installing pip is a bit more complicated though:
# * `apt install python3-pip` -> pulls in >100MB of unneeded stuff
# * `get-pip.py` script -> depends on distutils standard library module, removed by Debian
#
# Solution: install python3-setuptools (includes Python 3.6),
# then use the get-pip script from Python 3.7.
curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py
python3 get-pip.py
rm get-pip.py
python3 -m pip install --upgrade pip
python3 -m pip install --no-cache-dir nox
fi
EOS

ENV \
CC=$CC \
Expand All @@ -66,23 +66,20 @@ ENV \
NOX_ENV_DIR=$NOX_ENV_DIR \
XDG_CACHE_HOME=$NOX_ENV_DIR/.cache

RUN git clone -q \
RUN <<EOS
set -e
git clone -q \
--branch=release-1.12.1 \
--depth=1 \
https://github.com/google/googletest.git /tmp/googletest \
&& cd /tmp/googletest \
&& mkdir build \
&& cd build \
&& cmake .. \
&& make \
&& make install \
&& rm -rf /tmp/googletest

# Install nox
RUN \
if [ "$DOCKER_OS" != "ubuntu:23.04" ]; then \
python3 -m pip install --no-cache-dir nox ; \
fi;
https://github.com/google/googletest.git /tmp/googletest
cd /tmp/googletest
mkdir build
cd build
cmake ..
make
make install
rm -rf /tmp/googletest
EOS

# Create new user "docker" and set password to "docker"
RUN addgroup docker
Expand All @@ -98,5 +95,5 @@ ENV LC_ALL=C.UTF-8 LANG=C.UTF-8

WORKDIR /gcovr

# This are the arguments given to "docker run ... <Image> $0 $@"
# This are the arguments given to "docker run ... <Image> $0 $@"
ENTRYPOINT python3 -m nox --envdir $NOX_ENV_DIR $0 "$@"
0