diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml index ecaed8c..21bdcc1 100644 --- a/.github/workflows/wine.yml +++ b/.github/workflows/wine.yml @@ -17,6 +17,7 @@ jobs: matrix: tag: - latest + - staging steps: - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index 2066497..72958b2 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -48,11 +48,11 @@ if [[ $WINETRICKS_RUN =~ gecko ]]; then WINETRICKS_RUN=${WINETRICKS_RUN/gecko} if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then - wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.2/wine_gecko-2.47.2-x86.msi + wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.3/wine_gecko-2.47.3-x86.msi fi if [ ! -f "$WINEPREFIX/gecko_x86_64.msi" ]; then - wget -q -O $WINEPREFIX/gecko_x86_64.msi http://dl.winehq.org/wine/wine-gecko/2.47.2/wine_gecko-2.47.2-x86_64.msi + wget -q -O $WINEPREFIX/gecko_x86_64.msi http://dl.winehq.org/wine/wine-gecko/2.47.3/wine_gecko-2.47.3-x86_64.msi fi wine msiexec /i $WINEPREFIX/gecko_x86.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_install.log @@ -65,7 +65,7 @@ if [[ $WINETRICKS_RUN =~ mono ]]; then WINETRICKS_RUN=${WINETRICKS_RUN/mono} if [ ! -f "$WINEPREFIX/mono.msi" ]; then - wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/7.2.0/wine-mono-7.2.0-x86.msi + wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.msi fi wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index 3830fb8..39f98ad 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -36,5 +36,5 @@ ENV XVFB=1 USER container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile new file mode 100644 index 0000000..d29bae4 --- /dev/null +++ b/wine/staging/Dockerfile @@ -0,0 +1,40 @@ +# --------------------------------------- +# Generic Wine image based on Wine staging +# --------------------------------------- +FROM ghcr.io/parkervcp/yolks:debian + +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" + +## install required packages +RUN dpkg --add-architecture i386 \ + && apt update -y \ + && apt install -y --no-install-recommends gnupg2 tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 + +# Install winehq-stable and with recommends +RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \ + && apt-key add winehq.key \ + && echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \ + && wget -O- -q download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11/Release.key | apt-key add - \ + && echo "deb http://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./" | tee /etc/apt/sources.list.d/wine-obs.list \ + && apt update \ + && apt install -y --install-recommends winehq-staging cabextract + +# Set up Winetricks +RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \ + && chmod +x /usr/sbin/winetricks + +ENV HOME=/home/container +ENV WINEPREFIX=/home/container/.wine +ENV WINEDLLOVERRIDES="mscoree,mshtml=" +ENV DISPLAY=:0 +ENV DISPLAY_WIDTH=1024 +ENV DISPLAY_HEIGHT=768 +ENV DISPLAY_DEPTH=16 +ENV AUTO_UPDATE=1 +ENV XVFB=1 + +USER container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ]