Fix wine usage during unit test image build.

This commit is contained in:
/dev/urandom 2019-03-12 20:49:43 +01:00
parent 76ec1acc30
commit cc655368a3
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E

View File

@ -10,7 +10,7 @@ ENV WINEDEBUG -all
# Install Wine (32-bit) # Install Wine (32-bit)
RUN \ RUN \
echo -e "#!/bin/sh\nwine \$@\nretval=\$?\ntail --pid=\$(pidof wineserver 2>/dev/null||echo 0) -f /dev/null\nexit \$retval" > /usr/local/bin/wine-wrapper &&\ echo -e "#!/bin/sh\nwine \$@\nretval=\$?\nwineserver -w\nexit \$retval" > /usr/local/bin/wine-wrapper &&\
chmod +x /usr/local/bin/wine-wrapper &&\ chmod +x /usr/local/bin/wine-wrapper &&\
\ \
(\ (\
@ -19,6 +19,7 @@ RUN \
echo 'Include = /etc/pacman.d/mirrorlist'\ echo 'Include = /etc/pacman.d/mirrorlist'\
) >> /etc/pacman.conf &&\ ) >> /etc/pacman.conf &&\
pacman -Sy --noconfirm \ pacman -Sy --noconfirm \
awk \
lib32-gnutls \ lib32-gnutls \
wine \ wine \
wget \ wget \
@ -40,7 +41,6 @@ RUN \
find /. -name "*~" -type f -delete &&\ find /. -name "*~" -type f -delete &&\
rm -rf /tmp/* /var/tmp/* /usr/share/man/* /usr/share/info/* /usr/share/doc/* &&\ rm -rf /tmp/* /var/tmp/* /usr/share/man/* /usr/share/info/* /usr/share/doc/* &&\
pacman -Scc --noconfirm &&\ pacman -Scc --noconfirm &&\
paccache -rk0 &&\
rm -rf /var/lib/pacman/sync/* rm -rf /var/lib/pacman/sync/*
USER 0 USER 0