diff options
Diffstat (limited to 'ci/containers/libvirt-ubuntu-1804.Dockerfile')
| -rw-r--r-- | ci/containers/libvirt-ubuntu-1804.Dockerfile | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile b/ci/containers/libvirt-ubuntu-1804.Dockerfile index 4e3e5b5..1a39f3e 100644 --- a/ci/containers/libvirt-ubuntu-1804.Dockerfile +++ b/ci/containers/libvirt-ubuntu-1804.Dockerfile @@ -1,31 +1,20 @@ -FROM ubuntu:18.04 +FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get dist-upgrade -y && \ apt-get install --no-install-recommends -y \ - autoconf \ - automake \ - autopoint \ bash \ bash-completion \ ca-certificates \ ccache \ - chrony \ cpanminus \ gcc \ - gdb \ gettext \ git \ libc6-dev \ - libtool \ - libtool-bin \ libvirt-dev \ locales \ - lsof \ - make \ - net-tools \ - ninja-build \ patch \ perl \ pkgconf \ @@ -35,12 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-nose \ python3-pip \ python3-setuptools \ - python3-wheel \ - screen \ - strace \ - sudo \ - vim \ - xz-utils && \ + python3-wheel && \ apt-get autoremove -y && \ apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ @@ -49,9 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -RUN pip3 install \ - meson==0.54.0 - ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" |