Refactor Dockerfile and entrypoint script: update DotNet installation process, switch to Wine development version, and streamline Wine initialization
This commit is contained in:
@@ -20,12 +20,13 @@ RUN dpkg --add-architecture i386 \
|
||||
&& wget -qO - https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor -o /usr/share/keyrings/winehq-archive-keyring.gpg \
|
||||
&& echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list.d/winehq.list \
|
||||
&& apt update -y \
|
||||
&& apt install -y winehq-stable \
|
||||
&& apt install -y --install-recommends winehq-devel \
|
||||
&& apt install -y xvfb cabextract \
|
||||
&& wget -q https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O /usr/local/bin/winetricks \
|
||||
&& chmod +x /usr/local/bin/winetricks \
|
||||
&& apt clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
USER container
|
||||
ENV USER=container HOME=/home/container
|
||||
|
||||
@@ -33,6 +34,7 @@ ENV USER=container HOME=/home/container
|
||||
ENV WINEARCH=win64
|
||||
ENV WINEPREFIX=/home/container/.wine
|
||||
ENV DISPLAY=:99.0
|
||||
ENV WINEDLLOVERRIDES="mscoree,mshtml="
|
||||
|
||||
WORKDIR /home/container
|
||||
|
||||
|
@@ -5,7 +5,7 @@ cd /home/container
|
||||
INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
|
||||
export INTERNAL_IP
|
||||
|
||||
# set this variable, dotnet needs it even without it it reports to `dotnet --info` it can not start any aplication without this
|
||||
# DotNet environment setup
|
||||
export DOTNET_ROOT=/usr/share/
|
||||
|
||||
# Fix X11 permissions
|
||||
@@ -15,44 +15,31 @@ chmod 1777 /tmp/.X11-unix
|
||||
# Start Xvfb for Wine (virtual display)
|
||||
Xvfb :99 -screen 0 1024x768x16 -ac &
|
||||
export DISPLAY=:99.0
|
||||
sleep 3
|
||||
|
||||
# Wait for Xvfb to start
|
||||
sleep 5
|
||||
|
||||
# Force reinitialize Wine prefix to ensure it's properly set up
|
||||
echo "Reinitializing Wine prefix to ensure proper setup..."
|
||||
rm -rf "$WINEPREFIX"
|
||||
|
||||
# Set Wine architecture to 64-bit
|
||||
# Wine configuration
|
||||
export WINEARCH=win64
|
||||
export WINEPREFIX=/home/container/.wine
|
||||
export WINEDLLOVERRIDES="mscoree,mshtml="
|
||||
|
||||
# Initialize Wine prefix synchronously with timeout
|
||||
echo "Creating new Wine prefix..."
|
||||
timeout 30 wineboot --init || echo "Wineboot timed out, continuing..."
|
||||
if [ ! -d "$WINEPREFIX" ]; then
|
||||
echo "Initializing Wine prefix..."
|
||||
wine wineboot --init
|
||||
sleep 10
|
||||
|
||||
# Wait a bit more for any background processes
|
||||
sleep 5
|
||||
|
||||
# Kill any hanging wine processes
|
||||
pkill -f wine || true
|
||||
|
||||
# Skip winetricks for now as it may cause issues
|
||||
echo "Skipping winetricks installation to avoid hanging..."
|
||||
|
||||
# Test Wine installation with a simple command
|
||||
echo "Testing Wine installation..."
|
||||
timeout 10 wine cmd /c "echo Wine test successful" 2>/dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "Wine initialization complete and verified."
|
||||
else
|
||||
echo "Wine test failed, but Wine prefix was created. Continuing..."
|
||||
# Install essential components
|
||||
winetricks -q vcrun2019 corefonts
|
||||
sleep 5
|
||||
fi
|
||||
|
||||
# print the dotnet version on startup
|
||||
# Start Wine server
|
||||
wineserver -p &> /dev/null
|
||||
sleep 3
|
||||
|
||||
# Print versions
|
||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mdotnet --version\n"
|
||||
dotnet --version
|
||||
|
||||
# print the wine version on startup
|
||||
printf "\033[1m\033[33mcontainer@pelican~ \033[0mwine --version\n"
|
||||
wine --version
|
||||
|
||||
|
Reference in New Issue
Block a user