From 9bf807745323b669f4060d96573b202d3707e885 Mon Sep 17 00:00:00 2001 From: gOOvER <116325+gOOvER@users.noreply.github.com> Date: Sun, 6 Aug 2023 12:40:56 +0200 Subject: [PATCH 1/3] update all imanges to use latest keyrings and added wine devel --- .github/workflows/wine.yml | 1 + wine/devel/Dockerfile | 42 +++++++++++++++++++++++++++ wine/latest/Dockerfile | 58 ++++++++++++++++++++------------------ wine/staging/Dockerfile | 58 ++++++++++++++++++++------------------ 4 files changed, 103 insertions(+), 56 deletions(-) create mode 100644 wine/devel/Dockerfile diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml index 5bb10a6..f729fe8 100644 --- a/.github/workflows/wine.yml +++ b/.github/workflows/wine.yml @@ -17,6 +17,7 @@ jobs: matrix: tag: - latest + - devel - staging steps: - uses: actions/checkout@v3 diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile new file mode 100644 index 0000000..bb5e7c5 --- /dev/null +++ b/wine/devel/Dockerfile @@ -0,0 +1,42 @@ +# --------------------------------------- +# 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 + +## Setup user and working directory +RUN useradd -m -d /home/container -s /bin/bash container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index f587452..6937913 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -1,40 +1,42 @@ # --------------------------------------- # 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 -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 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 \ - && chmod +x /usr/sbin/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 +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 -USER container -WORKDIR /home/container +## Setup user and working directory +RUN useradd -m -d /home/container -s /bin/bash container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile index 6c7d761..437a37c 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -1,40 +1,42 @@ # --------------------------------------- # 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 -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 +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-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 \ - && chmod +x /usr/sbin/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 +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 -USER container -WORKDIR /home/container +## Setup user and working directory +RUN useradd -m -d /home/container -s /bin/bash container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +COPY ./../entrypoint.sh /entrypoint.sh +CMD [ "/bin/bash", "/entrypoint.sh" ] From efebbd6edf543f2831b8be38acb11f1c1542b876 Mon Sep 17 00:00:00 2001 From: gOOvER <116325+gOOvER@users.noreply.github.com> Date: Sun, 6 Aug 2023 12:43:52 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d845a0b..1971c3f 100644 --- a/README.md +++ b/README.md @@ -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) From 96c591862fd698c12c0bd405e238410ff06815bb Mon Sep 17 00:00:00 2001 From: gOOvER <116325+gOOvER@users.noreply.github.com> Date: Sun, 6 Aug 2023 12:51:30 +0200 Subject: [PATCH 3/3] remove user --- wine/devel/Dockerfile | 8 +------- wine/latest/Dockerfile | 8 +------- wine/staging/Dockerfile | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile index bb5e7c5..115d377 100644 --- a/wine/devel/Dockerfile +++ b/wine/devel/Dockerfile @@ -19,7 +19,7 @@ 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 \ +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 @@ -32,11 +32,5 @@ ENV DISPLAY_DEPTH=16 ENV AUTO_UPDATE=1 ENV XVFB=1 -## Setup user and working directory -RUN useradd -m -d /home/container -s /bin/bash container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index 6937913..2a1fa6b 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -19,7 +19,7 @@ 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 \ +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 @@ -32,11 +32,5 @@ ENV DISPLAY_DEPTH=16 ENV AUTO_UPDATE=1 ENV XVFB=1 -## Setup user and working directory -RUN useradd -m -d /home/container -s /bin/bash container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile index 437a37c..01858cb 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -19,7 +19,7 @@ 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 \ +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 @@ -32,11 +32,5 @@ ENV DISPLAY_DEPTH=16 ENV AUTO_UPDATE=1 ENV XVFB=1 -## Setup user and working directory -RUN useradd -m -d /home/container -s /bin/bash container -USER container -ENV USER=container HOME=/home/container -WORKDIR /home/container - COPY ./../entrypoint.sh /entrypoint.sh CMD [ "/bin/bash", "/entrypoint.sh" ]