devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #170 from gOOvER/wineupdate

Browse Source 
update all  wine images to use latest keyrings and added wine devel
This commit is contained in:
Michael (Parker) Parker
2023-08-11 09:57:26 -04:00
committed by GitHub
parent 6f24493faa 96c591862f
commit dbe89a4771
5 changed files with 88 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/wine.yml vendored
View File

@@ -17,6 +17,7 @@ jobs:
matrix:
tag:
- latest
- devel
- staging
steps:
- uses: actions/checkout@v3

1
README.md
View File

@@ -244,6 +244,7 @@ is tagged correctly.
* [`Wine`](/wine)
* `ghcr.io/parkervcp/yolks:wine_latest`
* `ghcr.io/parkervcp/yolks:wine_devel`
* `ghcr.io/parkervcp/yolks:wine_staging`
### [Installation Images](/installers)

36
wine/devel/Dockerfile Normal file
View File

@@ -0,0 +1,36 @@
# ---------------------------------------
# Generic Wine image based on Wine devel
# ---------------------------------------
FROM ghcr.io/parkervcp/yolks:debian
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
# 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/bullseye/winehq-bullseye.sources
RUN apt update
RUN apt install --install-recommends winehq-devel 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 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" ]

18
wine/latest/Dockerfile
View File

@@ -4,20 +4,19 @@
FROM ghcr.io/parkervcp/yolks:debian
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
# 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-stable cabextract
# 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/bullseye/winehq-bullseye.sources
RUN apt update
RUN apt install --install-recommends winehq-stable cabextract wine-binfmt -y
# Set up Winetricks
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
@@ -33,8 +32,5 @@ 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" ]

20
wine/staging/Dockerfile
View File

@@ -4,20 +4,19 @@
FROM ghcr.io/parkervcp/yolks:debian
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
LABEL org.opencontainers.image.licenses=MIT
## install required packages
RUN dpkg --add-architecture i386 \
&& apt update -y \
&& apt install -y --no-install-recommends gnupg2 tzdata numactl software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386 libsdl2-2.0-0 libsdl2-2.0-0:i386
&& 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
# 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
# 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/bullseye/winehq-bullseye.sources
RUN apt update
RUN apt install --install-recommends winehq-staging cabextract wine-binfmt -y
# Set up Winetricks
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
@@ -33,8 +32,5 @@ 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" ]