mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-29 21:12:07 -06:00
tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update
This update adds the removing of the EXTERNALLY-MANAGED marker files that has been added to the lcitool recently. Quoting Daniel: "For those who don't know, python now commonly blocks the ability to run 'pip install' outside of a venv. This generally makes sense for a precious installation environment. Our containers are disposable though, so a venv has no benefit. Removing the 'EXTERNALLY-MANAGED' allows the historical arbitrary use of 'pip' outside a venv. lcitool just does this unconditionally given the containers are not precious." Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20240418101056.302103-4-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
c723d9d16f
commit
2355d18c79
17 changed files with 29 additions and 12 deletions
|
@ -116,7 +116,8 @@ RUN apk update && \
|
||||||
zlib-static \
|
zlib-static \
|
||||||
zstd \
|
zstd \
|
||||||
zstd-dev && \
|
zstd-dev && \
|
||||||
apk list | sort > /packages.txt && \
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
|
apk list --installed | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||||
|
|
|
@ -123,6 +123,7 @@ RUN dnf distro-sync -y && \
|
||||||
zstd && \
|
zstd && \
|
||||||
dnf autoremove -y && \
|
dnf autoremove -y && \
|
||||||
dnf clean all -y && \
|
dnf clean all -y && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
|
|
|
@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
RUN /usr/bin/pip3 install tomli
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
RUN /usr/bin/pip3 install tomli
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
RUN /usr/bin/pip3 install tomli
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
RUN /usr/bin/pip3 install tomli
|
RUN /usr/bin/pip3 install tomli
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -33,7 +33,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -137,6 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales && \
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
|
|
|
@ -64,7 +64,8 @@ exec "$@"\n' > /usr/bin/nosync && \
|
||||||
xorriso \
|
xorriso \
|
||||||
zstd && \
|
zstd && \
|
||||||
nosync dnf autoremove -y && \
|
nosync dnf autoremove -y && \
|
||||||
nosync dnf clean all -y
|
nosync dnf clean all -y && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
|
||||||
|
|
||||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
ENV LANG "en_US.UTF-8"
|
ENV LANG "en_US.UTF-8"
|
||||||
|
|
|
@ -137,6 +137,7 @@ exec "$@"\n' > /usr/bin/nosync && \
|
||||||
zstd && \
|
zstd && \
|
||||||
nosync dnf autoremove -y && \
|
nosync dnf autoremove -y && \
|
||||||
nosync dnf clean all -y && \
|
nosync dnf clean all -y && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
|
|
|
@ -119,6 +119,7 @@ RUN zypper update -y && \
|
||||||
zlib-devel-static \
|
zlib-devel-static \
|
||||||
zstd && \
|
zstd && \
|
||||||
zypper clean --all && \
|
zypper clean --all && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
|
|
|
@ -137,6 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
dpkg-reconfigure locales && \
|
dpkg-reconfigure locales && \
|
||||||
|
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
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/c++ && \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue