tests/docker: remove ubuntu.docker container
This duplicates the ubuntu2004 container but with an inconsistent set of packages. 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-14-berrange@redhat.com> Message-Id: <20220105135009.1584676-14-alex.bennee@linaro.org>
This commit is contained in:
parent
122198393d
commit
6815e63f31
|
@ -29,11 +29,6 @@ amd64-ubuntu2004-container:
|
||||||
variables:
|
variables:
|
||||||
NAME: ubuntu2004
|
NAME: ubuntu2004
|
||||||
|
|
||||||
amd64-ubuntu-container:
|
|
||||||
extends: .container_job_template
|
|
||||||
variables:
|
|
||||||
NAME: ubuntu
|
|
||||||
|
|
||||||
amd64-opensuse-leap-container:
|
amd64-opensuse-leap-container:
|
||||||
extends: .container_job_template
|
extends: .container_job_template
|
||||||
variables:
|
variables:
|
||||||
|
|
|
@ -1,71 +0,0 @@
|
||||||
#
|
|
||||||
# Latest Ubuntu Release
|
|
||||||
#
|
|
||||||
# Useful for testing against relatively bleeding edge libraries and
|
|
||||||
# compilers. We also have seperate recipe for the most recent LTS
|
|
||||||
# release.
|
|
||||||
#
|
|
||||||
# When updating use the full tag not :latest otherwise the build
|
|
||||||
# system won't pick up that it has changed.
|
|
||||||
#
|
|
||||||
|
|
||||||
FROM docker.io/library/ubuntu:20.04
|
|
||||||
ENV PACKAGES \
|
|
||||||
ccache \
|
|
||||||
clang \
|
|
||||||
dbus \
|
|
||||||
gcc \
|
|
||||||
gettext \
|
|
||||||
git \
|
|
||||||
glusterfs-common \
|
|
||||||
libaio-dev \
|
|
||||||
libattr1-dev \
|
|
||||||
libbrlapi-dev \
|
|
||||||
libbz2-dev \
|
|
||||||
libcacard-dev \
|
|
||||||
libcap-ng-dev \
|
|
||||||
libcurl4-gnutls-dev \
|
|
||||||
libdrm-dev \
|
|
||||||
libepoxy-dev \
|
|
||||||
libfdt-dev \
|
|
||||||
libffi-dev \
|
|
||||||
libgbm-dev \
|
|
||||||
libgnutls28-dev \
|
|
||||||
libgtk-3-dev \
|
|
||||||
libibverbs-dev \
|
|
||||||
libiscsi-dev \
|
|
||||||
libjemalloc-dev \
|
|
||||||
libjpeg-turbo8-dev \
|
|
||||||
liblzo2-dev \
|
|
||||||
libncurses5-dev \
|
|
||||||
libncursesw5-dev \
|
|
||||||
libnfs-dev \
|
|
||||||
libnuma-dev \
|
|
||||||
libpixman-1-dev \
|
|
||||||
libpng-dev \
|
|
||||||
librados-dev \
|
|
||||||
librbd-dev \
|
|
||||||
librdmacm-dev \
|
|
||||||
libsasl2-dev \
|
|
||||||
libsdl2-dev \
|
|
||||||
libseccomp-dev \
|
|
||||||
libsnappy-dev \
|
|
||||||
libspice-protocol-dev \
|
|
||||||
libspice-server-dev \
|
|
||||||
libssh-dev \
|
|
||||||
libusb-1.0-0-dev \
|
|
||||||
libusbredirhost-dev \
|
|
||||||
libvdeplug-dev \
|
|
||||||
libvte-2.91-dev \
|
|
||||||
libxen-dev \
|
|
||||||
libzstd-dev \
|
|
||||||
make \
|
|
||||||
ninja-build \
|
|
||||||
python3-yaml \
|
|
||||||
python3-sphinx \
|
|
||||||
python3-sphinx-rtd-theme \
|
|
||||||
sparse \
|
|
||||||
xfslibs-dev
|
|
||||||
RUN apt-get update && \
|
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
|
|
||||||
RUN dpkg -l $PACKAGES | sort > /packages.txt
|
|
Loading…
Reference in New Issue