Commit 7eca99f2 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé 💬
Browse files

gitlab: refresh containers with lcitool for fully minimized base 



Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 7a3ac3a7

ci/containers/libvirt-centos-7.Dockerfile

+1 −24
Original line number Diff line number Diff line
@@ -35,38 +35,15 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ 
    yum install -y \

        ant \

        ant-junit \

        bash \

        bash-completion \

        ca-certificates \

        ccache \

        gcc \

        gettext \

        git \

        glibc-common \

        glibc-devel \

        java-11-openjdk-headless \

        jna \

        junit \

        libvirt-devel \

        patch \

        perl \

        perl-App-cpanminus \

        pkgconfig \

        python3 \

        python3-pip \

        python3-setuptools \

        python3-wheel \

        rpm-build && \

    yum autoremove -y && \

    yum clean all -y && \

    mkdir -p /usr/libexec/ccache-wrappers && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

    yum clean all -y



ENV LANG "en_US.UTF-8"
 


ENV MAKE "/usr/bin/make"

ENV NINJA "/usr/bin/ninja-build"

ENV PYTHON "/usr/bin/python3"



ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"

ci/containers/libvirt-centos-8.Dockerfile

+1 −24
Original line number Diff line number Diff line
@@ -7,37 +7,14 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ 
    dnf update -y && \

    dnf install -y \

        ant \

        bash \

        bash-completion \

        ca-certificates \

        ccache \

        gcc \

        gettext \

        git \

        glibc-devel \

        glibc-langpack-en \

        java-11-openjdk-headless \

        jna \

        libvirt-devel \

        patch \

        perl \

        perl-App-cpanminus \

        pkgconfig \

        python3 \

        python3-pip \

        python3-setuptools \

        python3-wheel \

        rpm-build && \

    dnf autoremove -y && \

    dnf clean all -y && \

    mkdir -p /usr/libexec/ccache-wrappers && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

    dnf clean all -y



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"

ci/containers/libvirt-centos-stream.Dockerfile

+1 −24
Original line number Diff line number Diff line
@@ -8,37 +8,14 @@ RUN dnf install -y centos-release-stream && \ 
    dnf update -y && \

    dnf install -y \

        ant \

        bash \

        bash-completion \

        ca-certificates \

        ccache \

        gcc \

        gettext \

        git \

        glibc-devel \

        glibc-langpack-en \

        java-11-openjdk-headless \

        jna \

        libvirt-devel \

        patch \

        perl \

        perl-App-cpanminus \

        pkgconfig \

        python3 \

        python3-pip \

        python3-setuptools \

        python3-wheel \

        rpm-build && \

    dnf autoremove -y && \

    dnf clean all -y && \

    mkdir -p /usr/libexec/ccache-wrappers && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

    dnf clean all -y



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"

ci/containers/libvirt-debian-10.Dockerfile

+2 −25
Original line number Diff line number Diff line
@@ -6,39 +6,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 
    apt-get install --no-install-recommends -y \

            ant \

            ant-optional \

            bash \

            bash-completion \

            ca-certificates \

            ccache \

            cpanminus \

            gcc \

            gettext \

            git \

            junit \

            libc6-dev \

            libjna-java \

            libvirt-dev \

            locales \

            openjdk-11-jdk-headless \

            patch \

            perl \

            pkgconf \

            python3 \

            python3-pip \

            python3-setuptools \

            python3-wheel && \

            openjdk-11-jdk-headless && \

    apt-get autoremove -y && \

    apt-get autoclean -y && \

    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \

    dpkg-reconfigure locales && \

    mkdir -p /usr/libexec/ccache-wrappers && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

    dpkg-reconfigure locales



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"

ci/containers/libvirt-debian-sid.Dockerfile

+2 −25
Original line number Diff line number Diff line
@@ -6,39 +6,16 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ 
    apt-get install --no-install-recommends -y \

            ant \

            ant-optional \

            bash \

            bash-completion \

            ca-certificates \

            ccache \

            cpanminus \

            gcc \

            gettext \

            git \

            junit \

            libc6-dev \

            libjna-java \

            libvirt-dev \

            locales \

            openjdk-11-jdk-headless \

            patch \

            perl \

            pkgconf \

            python3 \

            python3-pip \

            python3-setuptools \

            python3-wheel && \

            openjdk-11-jdk-headless && \

    apt-get autoremove -y && \

    apt-get autoclean -y && \

    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \

    dpkg-reconfigure locales && \

    mkdir -p /usr/libexec/ccache-wrappers && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)

    dpkg-reconfigure locales



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"