diff --git a/Dockerfile b/Dockerfile index 090cae3..ba729bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # force platfrom=linux/386 because alpine x64 doesn't support wine32 and LoxoneConfig is win32 -FROM --platform=linux/386 jlesage/baseimage-gui:alpine-3.17-v4.5 +FROM --platform=linux/386 jlesage/baseimage-gui:alpine-3.18-v4.5 RUN add-pkg wine wget xterm cabextract RUN wget -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks && \ diff --git a/docker-compose.yml b/docker-compose.yml index decd9eb..cb6f7a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,5 +15,7 @@ services: - DISPLAY_HEIGHT=1080 - HOME=/config/ - WINEPREFIX=/config/wine + - WINEARCH=win32 volumes: - "./config:/config:rw" + - "./config/Loxone:/config/wine/drive_c/users/app/Documents/Loxone:rw" diff --git a/init-install.sh b/init-install.sh index 4c9892f..721faf6 100755 --- a/init-install.sh +++ b/init-install.sh @@ -25,8 +25,8 @@ fi export WINEDEBUG=-all echo Installing winetricks helper for fonts and sharper rendering.. -#/usr/bin/winetricks fontsmooth-rgb -/usr/bin/winetricks corefonts +/usr/bin/winetricks fontsmooth-rgb +#/usr/bin/winetricks corefonts /usr/bin/winetricks gdiplus echo Installing LoxoneConfig.. wine "/config/LoxoneConfigSetup.exe" diff --git a/startapp.sh b/startapp.sh index ac16e25..088a84a 100755 --- a/startapp.sh +++ b/startapp.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ ! -d "/config/wine/drive_c" ]; then +if [ ! -d "/config/wine/drive_c/Program Files/Loxone" ]; then xterm -e "/init-install.sh" || exit 1 fi