Wine update (#284)

* add wine 7-10 Add images for wine tagged to specific versions * wine 9 remove libldap package * add locales; cleanup the image * Update Dockerfile * missed locales package * sort packages * Update Dockerfile * update default env update all wine images with the same default env values set `winedebug` to `-all` remove `winearch=win64` as that is the default for wine * update readme and workflow * add wine 7-10 Add images for wine tagged to specific versions * wine 9 remove libldap package * update default env update all wine images with the same default env values set `winedebug` to `-all` remove `winearch=win64` as that is the default for wine * update readme and workflow --------- Co-authored-by: gOOvER <[email protected]>
pelican-eggs · Feb 11, 2025 · a74ee17 · a74ee17
1 parent 3590298
commit a74ee17
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 0 deletions.
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
@@ -16,6 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         tag:
+          - "7"
+          - "8"
+          - "9"
+          - "10"
           - latest
           - devel
           - staging

diff --git a/README.md b/README.md
@@ -320,6 +320,10 @@ is tagged correctly.
 ### [Wine](/wine)
 
 * [`Wine`](/wine)
+  * `ghcr.io/parkervcp/yolks:wine_7`
+  * `ghcr.io/parkervcp/yolks:wine_8`
+  * `ghcr.io/parkervcp/yolks:wine_9`
+  * `ghcr.io/parkervcp/yolks:wine_10`
   * `ghcr.io/parkervcp/yolks:wine_latest`
   * `ghcr.io/parkervcp/yolks:wine_devel`
   * `ghcr.io/parkervcp/yolks:wine_staging`

diff --git a/wine/10/Dockerfile b/wine/10/Dockerfile
@@ -0,0 +1,46 @@
+# ---------------------------------------
+# Generic Wine image based on Wine staging 
+# ---------------------------------------
+FROM            ghcr.io/parkervcp/yolks:debian
+
+LABEL           author="Michael Parker" maintainer="[email protected]"
+LABEL           org.opencontainers.image.licenses=MIT
+
+## install required packages
+RUN             dpkg --add-architecture i386 \
+                && apt update -y \
+                && apt install -y --no-install-recommends 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             cd /tmp/ \
+                && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
+                && tar xvf rcon.tar.gz \
+                && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
+
+# Install wine and with recommends
+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 update
+RUN             apt install --install-recommends wine-stable-i386=10.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends wine-stable-amd64=10.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends wine-stable=10.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends winehq-stable=10.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends cabextract wine-binfmt -y
+
+# 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             WINEDEBUG=-all
+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" ]
diff --git a/wine/7/Dockerfile b/wine/7/Dockerfile
@@ -0,0 +1,46 @@
+# ---------------------------------------
+# Generic Wine image based on Wine stable 
+# ---------------------------------------
+FROM            ghcr.io/parkervcp/yolks:debian
+
+LABEL           author="Michael Parker" maintainer="[email protected]"
+LABEL           org.opencontainers.image.licenses=MIT
+
+## install required packages
+RUN             dpkg --add-architecture i386 \
+                && apt update -y \
+                && apt install -y --no-install-recommends 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             cd /tmp/ \
+                && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
+                && tar xvf rcon.tar.gz \
+                && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
+
+# Install wine and with recommends
+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 update
+RUN             apt install --install-recommends wine-stable-i386=7.0.2~bookworm-1 -y && \
+                apt install --install-recommends wine-stable-amd64=7.0.2~bookworm-1 -y && \
+                apt install --install-recommends wine-stable=7.0.2~bookworm-1 -y && \
+                apt install --install-recommends winehq-stable=7.0.2~bookworm-1 -y && \
+                apt install --install-recommends cabextract wine-binfmt -y
+
+# 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             WINEDEBUG=-all
+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" ]
diff --git a/wine/8/Dockerfile b/wine/8/Dockerfile
@@ -0,0 +1,46 @@
+# ---------------------------------------
+# Generic Wine image based on Wine staging 
+# ---------------------------------------
+FROM            ghcr.io/parkervcp/yolks:debian
+
+LABEL           author="Michael Parker" maintainer="[email protected]"
+LABEL           org.opencontainers.image.licenses=MIT
+
+## install required packages
+RUN             dpkg --add-architecture i386 \
+                && apt update -y \
+                && apt install -y --no-install-recommends 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             cd /tmp/ \
+                && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
+                && tar xvf rcon.tar.gz \
+                && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
+
+# Install wine and with recommends
+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 update
+RUN             apt install --install-recommends wine-stable-i386=8.0.2~bookworm-1 -y && \
+                apt install --install-recommends wine-stable-amd64=8.0.2~bookworm-1 -y && \
+                apt install --install-recommends wine-stable=8.0.2~bookworm-1 -y && \
+                apt install --install-recommends winehq-stable=8.0.2~bookworm-1 -y && \
+                apt install --install-recommends cabextract wine-binfmt -y
+
+# 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             WINEDEBUG=-all
+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" ]
diff --git a/wine/9/Dockerfile b/wine/9/Dockerfile
@@ -0,0 +1,46 @@
+# ---------------------------------------
+# Generic Wine image based on Wine staging 
+# ---------------------------------------
+FROM            ghcr.io/parkervcp/yolks:debian
+
+LABEL           author="Michael Parker" maintainer="[email protected]"
+LABEL           org.opencontainers.image.licenses=MIT
+
+## install required packages
+RUN             dpkg --add-architecture i386 \
+                && apt update -y \
+                && apt install -y --no-install-recommends 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             cd /tmp/ \
+                && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.3/rcon-0.10.3-amd64_linux.tar.gz > rcon.tar.gz \
+                && tar xvf rcon.tar.gz \
+                && mv rcon-0.10.3-amd64_linux/rcon /usr/local/bin/
+
+# Install wine and with recommends
+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 update
+RUN             apt install --install-recommends wine-stable-i386=9.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends wine-stable-amd64=9.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends wine-stable=9.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends winehq-stable=9.0.0.0~bookworm-1 -y && \
+                apt install --install-recommends cabextract wine-binfmt -y
+
+# 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             WINEDEBUG=-all
+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" ]
diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile
@@ -29,6 +29,7 @@ RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.co
 
 ENV             HOME=/home/container
 ENV             WINEPREFIX=/home/container/.wine
+ENV             WINEDEBUG=-all
 ENV             WINEDLLOVERRIDES="mscoree,mshtml="
 ENV             DISPLAY=:0
 ENV             DISPLAY_WIDTH=1024

diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile
@@ -29,6 +29,7 @@ RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.co
 
 ENV             HOME=/home/container
 ENV             WINEPREFIX=/home/container/.wine
+ENV             WINEDEBUG=-all
 ENV             WINEDLLOVERRIDES="mscoree,mshtml="
 ENV             DISPLAY=:0
 ENV             DISPLAY_WIDTH=1024

diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile
@@ -29,6 +29,7 @@ RUN	            wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.co
 
 ENV             HOME=/home/container
 ENV             WINEPREFIX=/home/container/.wine
+ENV             WINEDEBUG=-all
 ENV             WINEDLLOVERRIDES="mscoree,mshtml="
 ENV             DISPLAY=:0
 ENV             DISPLAY_WIDTH=1024
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,10 @@ jobs: @@
           fail-fast: false
           matrix:
             tag:
+              - "7"
+              - "8"
+              - "9"
+              - "10"
               - latest
               - devel
               - staging
@@ Expand Down @@