From 95f75a902e783a54f43047ddb796a2af84bd6a4e Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sat, 31 May 2025 17:44:46 -0300 Subject: [PATCH 01/11] Fix Docker build --- Dockerfile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3549bd8..4ada2c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,12 +27,21 @@ RUN apt-get update \ # Install wine ARG WINE_BRANCH="stable" -RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \ - && echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \ - && dpkg --add-architecture i386 \ - && apt-get update \ - && DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} \ - && rm -rf /var/lib/apt/lists/* +RUN wget -nv -O winehq.key https://dl.winehq.org/wine-builds/winehq.key && \ + APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add winehq.key && \ + echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ + dpkg --add-architecture i386 && \ + apt-get update && \ + DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} && \ + DEBIAN_FRONTEND="noninteractive" apt-get install -y \ + libwine \ + libwine:i386 \ + libgl1:i386 \ + libvulkan1 \ + libvulkan1:i386 \ + mesa-vulkan-drivers \ + mesa-vulkan-drivers:i386 \ + && rm -rf /var/lib/apt/lists/* winehq.key # Install winetricks RUN wget -nv -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \ From ad8f884660fd1e9ad2a74ccc1f6bbd94c254e724 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sat, 31 May 2025 18:00:28 -0300 Subject: [PATCH 02/11] Fix apt-key depreciation warning --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ada2c8..7e9dcc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,13 +23,14 @@ RUN apt-get update \ winbind \ xvfb \ zenity \ + nano \ && rm -rf /var/lib/apt/lists/* # Install wine ARG WINE_BRANCH="stable" RUN wget -nv -O winehq.key https://dl.winehq.org/wine-builds/winehq.key && \ - APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add winehq.key && \ - echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ + gpg --output /usr/share/keyrings/winehq-archive-keyring.gpg --dearmor winehq.key && \ + echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ dpkg --add-architecture i386 && \ apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} && \ From ac7b0a657695aee5cb6c33377718d2d4c484b870 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sat, 31 May 2025 18:01:22 -0300 Subject: [PATCH 03/11] Fix Dockerfile ENV --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e9dcc9..6feddc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ RUN chmod +x /root/download_gecko_and_mono.sh \ # Configure locale for unicode RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 COPY pulse-client.conf /root/pulse/client.conf COPY entrypoint.sh /usr/bin/entrypoint From c6736cb6c84d2bfd5e256986f71d39c7820e6b66 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sat, 31 May 2025 23:56:12 -0300 Subject: [PATCH 04/11] Fix build on macOS --- Dockerfile | 5 ++--- build | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6feddc0..d3738ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,7 @@ RUN apt-get update \ # Install wine ARG WINE_BRANCH="stable" -RUN wget -nv -O winehq.key https://dl.winehq.org/wine-builds/winehq.key && \ - gpg --output /usr/share/keyrings/winehq-archive-keyring.gpg --dearmor winehq.key && \ +RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > /usr/share/keyrings/winehq-archive-keyring.gpg && \ echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ dpkg --add-architecture i386 && \ apt-get update && \ @@ -42,7 +41,7 @@ RUN wget -nv -O winehq.key https://dl.winehq.org/wine-builds/winehq.key && \ libvulkan1:i386 \ mesa-vulkan-drivers \ mesa-vulkan-drivers:i386 \ - && rm -rf /var/lib/apt/lists/* winehq.key + && rm -rf /var/lib/apt/lists/* # Install winetricks RUN wget -nv -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \ diff --git a/build b/build index e058b0c..8f7ef70 100755 --- a/build +++ b/build @@ -103,6 +103,7 @@ if ! docker system info >/dev/null 2>&1; then fi ${BUILD_CMD} "${BUILD_ARGS[@]}" \ + --platform="linux/amd64" \ --build-arg="BASE_IMAGE=${BASE_IMAGE}" \ --build-arg="TAG=${TAG}" \ --build-arg="WINE_BRANCH=${WINE_BRANCH}" \ From 03a6579310e75cb7639553d79c23b6c9b8d1253c Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sun, 1 Jun 2025 01:54:11 -0300 Subject: [PATCH 05/11] Remove Vulkan --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3738ff..c1cccc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,10 +37,6 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > libwine \ libwine:i386 \ libgl1:i386 \ - libvulkan1 \ - libvulkan1:i386 \ - mesa-vulkan-drivers \ - mesa-vulkan-drivers:i386 \ && rm -rf /var/lib/apt/lists/* # Install winetricks From d071d0038e5219d7f50106bfc524cb04d5c4b9c2 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sun, 1 Jun 2025 02:20:24 -0300 Subject: [PATCH 06/11] Drop OpenGL support --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1cccc0..7b49bab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,6 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > DEBIAN_FRONTEND="noninteractive" apt-get install -y \ libwine \ libwine:i386 \ - libgl1:i386 \ && rm -rf /var/lib/apt/lists/* # Install winetricks From 537436c3a7d81be948be47c51522a7b06fd1b7aa Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sun, 1 Jun 2025 02:24:24 -0300 Subject: [PATCH 07/11] Drop OpenGL support installed by libwine --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b49bab..184eb37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,8 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y \ libwine \ - libwine:i386 \ + libwine:i386 && \ + DEBIAN_FRONTEND="noninteractive" apt-get remove -y libgl1:i386 \ && rm -rf /var/lib/apt/lists/* # Install winetricks From 506d854526adc321acc5831d2cc21aa951b6a37b Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sun, 1 Jun 2025 21:34:06 -0300 Subject: [PATCH 08/11] Update Dockerfile --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 184eb37..ea56a7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ RUN apt-get update \ winbind \ xvfb \ zenity \ - nano \ && rm -rf /var/lib/apt/lists/* # Install wine @@ -32,11 +31,7 @@ RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ dpkg --add-architecture i386 && \ apt-get update && \ - DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} && \ - DEBIAN_FRONTEND="noninteractive" apt-get install -y \ - libwine \ - libwine:i386 && \ - DEBIAN_FRONTEND="noninteractive" apt-get remove -y libgl1:i386 \ + DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} \ && rm -rf /var/lib/apt/lists/* # Install winetricks From 4271fa3fcd540d748e421f1febcb5f211ddb7669 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Sun, 1 Jun 2025 21:35:07 -0300 Subject: [PATCH 09/11] Update Dockerfile --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea56a7f..5c6d9d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,11 +27,11 @@ RUN apt-get update \ # Install wine ARG WINE_BRANCH="stable" -RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > /usr/share/keyrings/winehq-archive-keyring.gpg && \ - echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list && \ - dpkg --add-architecture i386 && \ - apt-get update && \ - DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} \ +RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > /usr/share/keyrings/winehq-archive-keyring.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/winehq-archive-keyring.gpg] https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \ + && dpkg --add-architecture i386 \ + && apt-get update \ + && DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends winehq-${WINE_BRANCH} \ && rm -rf /var/lib/apt/lists/* # Install winetricks From 276c1011f6b58337b8211f6c331443c27cab7f43 Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Mon, 2 Jun 2025 01:20:02 -0300 Subject: [PATCH 10/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5c6d9d2..c1ff1c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update \ # Install wine ARG WINE_BRANCH="stable" -RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | gpg --dearmor > /usr/share/keyrings/winehq-archive-keyring.gpg \ +RUN wget -nv -O- 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/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \ && dpkg --add-architecture i386 \ && apt-get update \ From 08e1b17aa09d38095a59609946366817c9de84ee Mon Sep 17 00:00:00 2001 From: Eduardo Mozart de Oliveira <2974895+eduardomozart@users.noreply.github.com> Date: Mon, 2 Jun 2025 02:10:18 -0300 Subject: [PATCH 11/11] Update build --- build | 1 - 1 file changed, 1 deletion(-) diff --git a/build b/build index 8f7ef70..e058b0c 100755 --- a/build +++ b/build @@ -103,7 +103,6 @@ if ! docker system info >/dev/null 2>&1; then fi ${BUILD_CMD} "${BUILD_ARGS[@]}" \ - --platform="linux/amd64" \ --build-arg="BASE_IMAGE=${BASE_IMAGE}" \ --build-arg="TAG=${TAG}" \ --build-arg="WINE_BRANCH=${WINE_BRANCH}" \