Skip to content

Commit aefe3fc

Browse files
committed
Adapt some things to changes in Debian 13
1 parent 0cc28c2 commit aefe3fc

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,25 @@ ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tin
1010
RUN chmod +x /tini
1111

1212
COPY apt /etc/apt
13+
COPY fix-xvfb.sh /tmp/
1314

1415
RUN \
1516
dpkg --add-architecture i386 \
16-
&& apt-get update -y \
17-
&& apt-get install -y --no-install-recommends \
17+
&& apt-get install -y --update --no-install-recommends \
1818
ca-certificates \
1919
curl \
2020
unzip \
2121
xauth \
2222
xvfb \
23+
&& /tmp/fix-xvfb.sh \
2324
&& apt-get clean \
2425
&& rm -rf /var/lib/apt/lists/*
2526

26-
COPY fix-xvfb.sh /tmp/
27-
2827
ARG WINE_FLAVOUR=stable
2928

3029
RUN \
31-
/tmp/fix-xvfb.sh \
32-
&& sed -i '/^Enabled:/ s/no/yes/' /etc/apt/sources.list.d/* \
33-
&& apt-get update -y \
34-
&& apt-get install -y --no-install-recommends \
30+
sed -i '/^Enabled:/ s/no/yes/' /etc/apt/sources.list.d/* \
31+
&& apt-get install -y --update --no-install-recommends \
3532
winehq-${WINE_FLAVOUR} \
3633
&& apt-get clean \
3734
&& rm -rf /var/lib/apt/lists/*

fix-xvfb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44
# shellcheck disable=SC2016,SC1004
55
sed -i '/kill ".*"/a \
6-
wait "$XVFBPID" >>"$ERRORFILE" 2>&1
6+
wait "$XVFBPID" >&3 2>&3
77
' /usr/bin/xvfb-run
88
rm "$0"
99

0 commit comments

Comments
 (0)