Merge pull request #170 from gOOvER/wineupdate
update all wine images to use latest keyrings and added wine devel
This commit is contained in:
Michael (Parker) Parker
1
.github/workflows/wine.yml
vendored
1
.github/workflows/wine.yml
vendored
@@ -17,6 +17,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
tag:
|
tag:
|
||||||
- latest
|
- latest
|
||||||
|
- devel
|
||||||
- staging
|
- staging
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|||||||
@@ -244,6 +244,7 @@ is tagged correctly.
|
|||||||
|
|
||||||
* [`Wine`](/wine)
|
* [`Wine`](/wine)
|
||||||
* `ghcr.io/parkervcp/yolks:wine_latest`
|
* `ghcr.io/parkervcp/yolks:wine_latest`
|
||||||
|
* `ghcr.io/parkervcp/yolks:wine_devel`
|
||||||
* `ghcr.io/parkervcp/yolks:wine_staging`
|
* `ghcr.io/parkervcp/yolks:wine_staging`
|
||||||
|
|
||||||
### [Installation Images](/installers)
|
### [Installation Images](/installers)
|
||||||
|
|||||||
36
wine/devel/Dockerfile
Normal file
36
wine/devel/Dockerfile
Normal 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" ]
|
||||||
@@ -1,40 +1,36 @@
|
|||||||
# ---------------------------------------
|
# ---------------------------------------
|
||||||
# Generic Wine image based on Wine stable
|
# Generic Wine image based on Wine stable
|
||||||
# ---------------------------------------
|
# ---------------------------------------
|
||||||
FROM ghcr.io/parkervcp/yolks:debian
|
FROM ghcr.io/parkervcp/yolks:debian
|
||||||
|
|
||||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||||
|
LABEL org.opencontainers.image.licenses=MIT
|
||||||
|
|
||||||
## install required packages
|
## install required packages
|
||||||
RUN dpkg --add-architecture i386 \
|
RUN dpkg --add-architecture i386 \
|
||||||
&& apt update -y \
|
&& 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
|
&& 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
|
# Install wine and with recommends
|
||||||
RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \
|
RUN mkdir -pm755 /etc/apt/keyrings
|
||||||
&& apt-key add winehq.key \
|
RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
|
||||||
&& echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \
|
RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources
|
||||||
&& wget -O- -q download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11/Release.key | apt-key add - \
|
RUN apt update
|
||||||
&& echo "deb http://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./" | tee /etc/apt/sources.list.d/wine-obs.list \
|
RUN apt install --install-recommends winehq-stable cabextract wine-binfmt -y
|
||||||
&& apt update \
|
|
||||||
&& apt install -y --install-recommends winehq-stable cabextract
|
|
||||||
|
|
||||||
# Set up Winetricks
|
# Set up Winetricks
|
||||||
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
|
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
|
||||||
&& chmod +x /usr/sbin/winetricks
|
&& chmod +x /usr/sbin/winetricks
|
||||||
|
|
||||||
ENV HOME=/home/container
|
ENV HOME=/home/container
|
||||||
ENV WINEPREFIX=/home/container/.wine
|
ENV WINEPREFIX=/home/container/.wine
|
||||||
ENV WINEDLLOVERRIDES="mscoree,mshtml="
|
ENV WINEDLLOVERRIDES="mscoree,mshtml="
|
||||||
ENV DISPLAY=:0
|
ENV DISPLAY=:0
|
||||||
ENV DISPLAY_WIDTH=1024
|
ENV DISPLAY_WIDTH=1024
|
||||||
ENV DISPLAY_HEIGHT=768
|
ENV DISPLAY_HEIGHT=768
|
||||||
ENV DISPLAY_DEPTH=16
|
ENV DISPLAY_DEPTH=16
|
||||||
ENV AUTO_UPDATE=1
|
ENV AUTO_UPDATE=1
|
||||||
ENV XVFB=1
|
ENV XVFB=1
|
||||||
|
|
||||||
USER container
|
COPY ./../entrypoint.sh /entrypoint.sh
|
||||||
WORKDIR /home/container
|
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
||||||
|
|
||||||
COPY ./../entrypoint.sh /entrypoint.sh
|
|
||||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
|
||||||
|
|||||||
@@ -1,40 +1,36 @@
|
|||||||
# ---------------------------------------
|
# ---------------------------------------
|
||||||
# Generic Wine image based on Wine staging
|
# Generic Wine image based on Wine staging
|
||||||
# ---------------------------------------
|
# ---------------------------------------
|
||||||
FROM ghcr.io/parkervcp/yolks:debian
|
FROM ghcr.io/parkervcp/yolks:debian
|
||||||
|
|
||||||
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
|
||||||
|
LABEL org.opencontainers.image.licenses=MIT
|
||||||
|
|
||||||
## install required packages
|
## install required packages
|
||||||
RUN dpkg --add-architecture i386 \
|
RUN dpkg --add-architecture i386 \
|
||||||
&& apt update -y \
|
&& 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
|
# Install wine and with recommends
|
||||||
RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key \
|
RUN mkdir -pm755 /etc/apt/keyrings
|
||||||
&& apt-key add winehq.key \
|
RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
|
||||||
&& echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list \
|
RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources
|
||||||
&& wget -O- -q download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11/Release.key | apt-key add - \
|
RUN apt update
|
||||||
&& echo "deb http://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Debian_11 ./" | tee /etc/apt/sources.list.d/wine-obs.list \
|
RUN apt install --install-recommends winehq-staging cabextract wine-binfmt -y
|
||||||
&& apt update \
|
|
||||||
&& apt install -y --install-recommends winehq-staging cabextract
|
|
||||||
|
|
||||||
# Set up Winetricks
|
# Set up Winetricks
|
||||||
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
|
RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
|
||||||
&& chmod +x /usr/sbin/winetricks
|
&& chmod +x /usr/sbin/winetricks
|
||||||
|
|
||||||
ENV HOME=/home/container
|
ENV HOME=/home/container
|
||||||
ENV WINEPREFIX=/home/container/.wine
|
ENV WINEPREFIX=/home/container/.wine
|
||||||
ENV WINEDLLOVERRIDES="mscoree,mshtml="
|
ENV WINEDLLOVERRIDES="mscoree,mshtml="
|
||||||
ENV DISPLAY=:0
|
ENV DISPLAY=:0
|
||||||
ENV DISPLAY_WIDTH=1024
|
ENV DISPLAY_WIDTH=1024
|
||||||
ENV DISPLAY_HEIGHT=768
|
ENV DISPLAY_HEIGHT=768
|
||||||
ENV DISPLAY_DEPTH=16
|
ENV DISPLAY_DEPTH=16
|
||||||
ENV AUTO_UPDATE=1
|
ENV AUTO_UPDATE=1
|
||||||
ENV XVFB=1
|
ENV XVFB=1
|
||||||
|
|
||||||
USER container
|
COPY ./../entrypoint.sh /entrypoint.sh
|
||||||
WORKDIR /home/container
|
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
||||||
|
|
||||||
COPY ./../entrypoint.sh /entrypoint.sh
|
|
||||||
CMD [ "/bin/bash", "/entrypoint.sh" ]
|
|
||||||
|
|||||||
Reference in New Issue
Block a user