From 406be43c00508c66d1055994e4a2333356105c96 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Tue, 3 Sep 2024 21:22:52 -0700
Subject: [PATCH] Manually build wine

---
 Jenkinsfile                        |  4 +--
 build.sh                           |  2 +-
 wine/8.0/Dockerfile                | 54 ++++++++++++++++++++++++++++++
 wine/{latest => 8.0}/entrypoint.sh |  0
 wine/latest/Dockerfile             | 30 -----------------
 5 files changed, 57 insertions(+), 33 deletions(-)
 create mode 100644 wine/8.0/Dockerfile
 rename wine/{latest => 8.0}/entrypoint.sh (100%)
 delete mode 100644 wine/latest/Dockerfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 0862cd1..55f3e7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -134,7 +134,7 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/yolks:wine_latest wine/latest
+                    docker build -t git.zontreck.com/ariascreations/yolks:wine_8.0 wine/8.0
                     '''
                 }
             }
@@ -150,7 +150,7 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker push git.zontreck.com/ariascreations/yolks:wine_latest
+                    docker push git.zontreck.com/ariascreations/yolks:wine_8.0
                     '''
                 }
             }
diff --git a/build.sh b/build.sh
index 1e4c0d0..f9ce49d 100755
--- a/build.sh
+++ b/build.sh
@@ -20,4 +20,4 @@ docker build -t git.zontreck.com/ariascreations/yolks:jdk19 java/19
 docker build -t git.zontreck.com/ariascreations/yolks:jdk21 java/21
 
 # Build wine
-docker build -t git.zontreck.com/ariascreations/yolks:wine_latest wine/latest
\ No newline at end of file
+docker build -t git.zontreck.com/ariascreations/yolks:wine_8.0 wine/8.0
\ No newline at end of file
diff --git a/wine/8.0/Dockerfile b/wine/8.0/Dockerfile
new file mode 100644
index 0000000..76222aa
--- /dev/null
+++ b/wine/8.0/Dockerfile
@@ -0,0 +1,54 @@
+FROM debian:latest AS BUILDER
+
+RUN dpkg --add-architecture i386
+RUN apt-get update
+RUN apt-get upgrade -y
+
+RUN apt-get install -y git build-essential gcc-multilib gcc-mingw-w64 libasound2-dev libpulse-dev libdbus-1-dev libfontconfig-dev libfreetype-dev libgnutls28-dev libgl-dev libunwind-dev libx11-dev libxcomposite-dev libxcursor-dev libxfixes-dev libxi-dev libxrandr-dev libxrender-dev libxext-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libosmesa6-dev libsdl2-dev libudev-dev libvulkan-dev libcapi20-dev libcups2-dev libgphoto2-dev libsane-dev libkrb5-dev samba-dev ocl-icd-opencl-dev libpcap-dev libusb-1.0-0-dev libv4l-dev libxxf86vm-dev libxinerama-dev pkgconfig 
+
+
+WORKDIR /tmp
+RUN git clone https://git.zontreck.com/zontreck/wine
+RUN cd wine && git checkout wine-8.0 && cd ..
+RUN cp -rv wine wine32
+WORKDIR /tmp/wine
+
+
+
+RUN ./configure --enable-win64 --prefix=/var/lib/wine
+RUN make
+
+WORKDIR /tmp/wine32
+
+RUN PKG_CONFIG_PATH=$(which pkgconfig) ./configure --with-wine64=/tmp/wine --prefix=/var/lib/wine
+RUN make
+RUN make install
+
+
+
+
+FROM git.zontreck.com/ariascreations/yolks:debian
+
+RUN dpkg --add-architecture i386
+
+RUN apt-get update
+RUN apt-get install -y gnupg2 numactl tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386
+
+COPY --from=BUILDER /var/lib/wine /var/lib/wine
+RUN export PATH=$PATH:/var/lib/wine/bin:/var/lib/wine/sbin
+
+RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/winetricks/winetricks/master/src/winetricks
+RUN 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
+
+COPY ./entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/wine/latest/entrypoint.sh b/wine/8.0/entrypoint.sh
similarity index 100%
rename from wine/latest/entrypoint.sh
rename to wine/8.0/entrypoint.sh
diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile
deleted file mode 100644
index 33a95d8..0000000
--- a/wine/latest/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM git.zontreck.com/ariascreations/yolks:debian
-
-RUN dpkg --add-architecture i386
-
-RUN apt-get update
-RUN apt-get install -y gnupg2 numactl tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386
-
-
-RUN mkdir -pm755 /etc/apt/keyrings
-RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
-RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources
-
-RUN apt-get update
-RUN apt-get install -y winehq-stable cabextract wine-binfmt
-
-RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/winetricks/winetricks/master/src/winetricks
-RUN 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
-
-COPY ./entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file