tests/docker: auto-generate alpine.docker with lcitool

This commit is best examined using the "-b" option to diff.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-19-berrange@redhat.com>
Message-Id: <20220105135009.1584676-19-alex.bennee@linaro.org>
This commit is contained in:
Daniel P. Berrangé 2022-01-05 13:49:53 +00:00 committed by Alex Bennée
parent e630278008
commit e1cb5c7550
2 changed files with 120 additions and 106 deletions

View File

@ -1,11 +1,14 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool dockerfile alpine-edge qemu
#
# https://gitlab.com/libvirt/libvirt-ci
FROM alpine:edge
FROM docker.io/library/alpine:edge
RUN apk update
RUN apk upgrade
# Please keep this list sorted alphabetically
ENV PACKAGES \
RUN apk update && \
apk upgrade && \
apk add \
alsa-lib-dev \
attr-dev \
bash \
@ -104,6 +107,16 @@ ENV PACKAGES \
xfsprogs-dev \
zlib-dev \
zlib-static \
zstd-dev
zstd-dev && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN apk add $PACKAGES
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

View File

@ -84,6 +84,7 @@ try:
generate_dockerfile("ubuntu2004", "ubuntu-2004",
trailer="".join(ubuntu2004_tsanhack))
generate_dockerfile("opensuse-leap", "opensuse-leap-152")
generate_dockerfile("alpine", "alpine-edge")
generate_cirrus("freebsd-12")
generate_cirrus("freebsd-13")