gitlab: refresh containers with lcitool for fully minimized base

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-11-23 18:20:57 +00:00
parent ab84b11b2d
commit bf29e894c8
13 changed files with 7 additions and 157 deletions

View File

@ -35,17 +35,14 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
yum install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
gcc \
gettext \
gettext-devel \
git \
glib2-devel \
glibc-common \
glibc-devel \
gtk-vnc2-devel \
gtk3-devel \
icoutils \
@ -56,14 +53,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
libxml2 \
libxml2-devel \
make \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rest-devel \
rpm-build \
spice-gtk3-devel && \
@ -74,9 +64,5 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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"

View File

@ -8,7 +8,6 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
dnf install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
@ -36,9 +35,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
libxslt \
make \
ninja-build \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
pulseaudio-libs-devel \
python3 \
@ -60,9 +57,7 @@ RUN pip3 install \
meson==0.54.0
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

@ -9,7 +9,6 @@ RUN dnf install -y centos-release-stream && \
dnf install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
@ -37,9 +36,7 @@ RUN dnf install -y centos-release-stream && \
libxslt \
make \
ninja-build \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
pulseaudio-libs-devel \
python3 \
@ -61,9 +58,7 @@ RUN pip3 install \
meson==0.54.0
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

@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
autoconf \
automake \
autopoint \
bash \
bash-completion \
ca-certificates \
ccache \
cpanminus \
gcc \
gettext \
git \
icoutils \
libc6-dev \
libglib2.0-dev \
libgovirt-dev \
libgtk-3-dev \
@ -31,13 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-utils \
locales \
make \
patch \
perl \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel && \
pkgconf && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@ -47,9 +37,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
autoconf \
automake \
autopoint \
bash \
bash-completion \
ca-certificates \
ccache \
cpanminus \
gcc \
gettext \
git \
icoutils \
libc6-dev \
libglib2.0-dev \
libgovirt-dev \
libgtk-3-dev \
@ -31,13 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-utils \
locales \
make \
patch \
perl \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel && \
pkgconf && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@ -47,9 +37,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -4,16 +4,13 @@ RUN dnf update -y && \
dnf install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
gcc \
gettext \
gettext-devel \
git \
glib2-devel \
glibc-devel \
glibc-langpack-en \
gtk-vnc2-devel \
gtk3-devel \
@ -25,14 +22,7 @@ RUN dnf update -y && \
libxml2 \
libxml2-devel \
make \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rest-devel \
rpm-build \
spice-gtk3-devel && \
@ -43,9 +33,5 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -1,19 +1,16 @@
FROM fedora:33
FROM registry.fedoraproject.org/fedora:33
RUN dnf update -y && \
dnf install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
gcc \
gettext \
gettext-devel \
git \
glib2-devel \
glibc-devel \
glibc-langpack-en \
gtk-vnc2-devel \
gtk3-devel \
@ -25,14 +22,7 @@ RUN dnf update -y && \
libxml2 \
libxml2-devel \
make \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rest-devel \
rpm-build \
spice-gtk3-devel && \
@ -43,9 +33,5 @@ RUN dnf update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -6,12 +6,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
augeas \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
clang \
cppi \
diffutils \
dnsmasq \
dwarves \
ebtables \
@ -38,16 +38,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
ninja-build \
numad \
parted \
patch \
perl \
perl-App-cpanminus \
polkit \
python3 \
python3-docutils \
python3-flake8 \
python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
radvd \
rpcgen \
@ -87,11 +82,9 @@ RUN dnf install -y \
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"
ENV ABI "i686-w64-mingw32"

View File

@ -6,12 +6,12 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
augeas \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
clang \
cppi \
diffutils \
dnsmasq \
dwarves \
ebtables \
@ -38,16 +38,11 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
ninja-build \
numad \
parted \
patch \
perl \
perl-App-cpanminus \
polkit \
python3 \
python3-docutils \
python3-flake8 \
python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
radvd \
rpcgen \
@ -87,11 +82,9 @@ RUN dnf install -y \
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"
ENV ABI "x86_64-w64-mingw32"

View File

@ -5,16 +5,13 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
gcc \
gettext \
gettext-devel \
git \
glib2-devel \
glibc-devel \
glibc-langpack-en \
gtk-vnc2-devel \
gtk3-devel \
@ -26,14 +23,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
libxml2 \
libxml2-devel \
make \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rest-devel \
rpm-build \
spice-gtk3-devel && \
@ -44,9 +34,5 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -4,16 +4,13 @@ RUN zypper update -y && \
zypper install -y \
autoconf \
automake \
bash \
bash-completion \
ca-certificates \
ccache \
gcc \
gettext \
gettext-devel \
git \
glib2-devel \
glibc-devel \
glibc-locale \
gtk-vnc2-devel \
gtk3-devel \
@ -26,14 +23,7 @@ RUN zypper update -y && \
libxml2 \
libxml2-devel \
make \
patch \
perl \
perl-App-cpanminus \
pkgconfig \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
rpm-build \
spice-gtk-devel && \
zypper clean --all && \
@ -42,9 +32,5 @@ RUN zypper update -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
autoconf \
automake \
autopoint \
bash \
bash-completion \
ca-certificates \
ccache \
cpanminus \
gcc \
gettext \
git \
icoutils \
libc6-dev \
libglib2.0-dev \
libgtk-3-dev \
libgtk-vnc-2.0-dev \
@ -30,13 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-utils \
locales \
make \
patch \
perl \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel && \
pkgconf && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@ -46,9 +36,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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

@ -7,16 +7,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
autoconf \
automake \
autopoint \
bash \
bash-completion \
ca-certificates \
ccache \
cpanminus \
gcc \
gettext \
git \
icoutils \
libc6-dev \
libglib2.0-dev \
libgtk-3-dev \
libgtk-vnc-2.0-dev \
@ -30,13 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libxml2-utils \
locales \
make \
patch \
perl \
pkgconf \
python3 \
python3-pip \
python3-setuptools \
python3-wheel && \
pkgconf && \
apt-get autoremove -y && \
apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
@ -46,9 +36,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
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"