From 07e0169adb34b6a63ade6f68601a72b67437497b Mon Sep 17 00:00:00 2001 From: gOOvER <116325+gOOvER@users.noreply.github.com> Date: Sun, 6 Aug 2023 12:35:23 +0200 Subject: [PATCH] update wine and cleabup --- wine/devel/Dockerfile | 110 ++++++++++++++++++------------------ wine/stable/Dockerfile | 109 ++++++++++++++++++------------------ wine/staging/Dockerfile | 120 ++++++++++++++++++---------------------- 3 files changed, 165 insertions(+), 174 deletions(-) diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile index d42904d..597ed17 100644 --- a/wine/devel/Dockerfile +++ b/wine/devel/Dockerfile @@ -1,66 +1,66 @@ -FROM debian:bookworm-slim +FROM debian:bookworm-slim -LABEL author="Torsten Widmann" maintainer="info@goover.de" -LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" -LABEL org.opencontainers.image.licenses=MIT +LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" +LABEL org.opencontainers.image.licenses=MIT ## install required packages -RUN dpkg --add-architecture i386 -RUN apt update -RUN apt -y upgrade -RUN apt install -y --no-install-recommends \ - wget \ - iproute2 \ - gnupg2 \ - software-properties-common \ - libntlm0 \ - winbind \ - xvfb \ - xauth \ - python3 \ - libncurses5-dev:i386 \ - libncurses6 \ - dbus \ - libgdiplus \ - lib32gcc-s1 \ - netcat-openbsd \ - alsa-tools \ - libpulse-dev \ - libasound2 \ - libao-common \ - gnutls-bin \ - libasound2 \ - locales \ - gnupg \ - numactl +RUN dpkg --add-architecture i386 +RUN apt update +RUN apt -y upgrade +RUN apt install -y --no-install-recommends \ + wget \ + iproute2 \ + gnupg2 \ + software-properties-common \ + libntlm0 \ + winbind \ + xvfb \ + xauth \ + python3 \ + libncurses5-dev:i386 \ + libncurses6 \ + dbus \ + libgdiplus \ + lib32gcc-s1 \ + netcat-openbsd \ + alsa-tools \ + libpulse-dev \ + libasound2 \ + libao-common \ + gnutls-bin \ + libasound2 \ + locales \ + gnupg \ + numactl -RUN useradd -d /home/container -m container # 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 winehq-devel cabextract -y +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 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 chmod +x /usr/sbin/winetricks +RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +RUN chmod +x /usr/sbin/winetricks -ENV HOME=/home/container -ENV WINEPREFIX=/home/container/.wine -ENV WINEDLLOVERRIDES="mscoree,mshtml=" -ENV WINDEBUG=-all -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 -ENV USER=container HOME=/home/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/stable/Dockerfile b/wine/stable/Dockerfile index ea92bdb..aafc4c8 100644 --- a/wine/stable/Dockerfile +++ b/wine/stable/Dockerfile @@ -1,65 +1,66 @@ -FROM debian:bookworm-slim +FROM debian:bookworm-slim -LABEL author="Torsten Widmann" maintainer="info@goover.de" -LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" -LABEL org.opencontainers.image.licenses=MIT +LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" +LABEL org.opencontainers.image.licenses=MIT ## install required packages -RUN dpkg --add-architecture i386 -RUN apt update -RUN apt -y upgrade -RUN apt install -y --no-install-recommends \ - wget \ - iproute2 \ - gnupg2 \ - software-properties-common \ - libntlm0 \ - winbind \ - xvfb \ - xauth \ - python3 \ - libncurses5-dev:i386 \ - libncurses6 \ - dbus \ - libgdiplus \ - lib32gcc-s1 \ - netcat-openbsd \ - alsa-tools \ - libpulse-dev \ - libasound2 \ - libao-common \ - gnutls-bin \ - libasound2 \ - locales \ - gnupg \ - numactl +RUN dpkg --add-architecture i386 +RUN apt update +RUN apt -y upgrade +RUN apt install -y --no-install-recommends \ + wget \ + iproute2 \ + gnupg2 \ + software-properties-common \ + libntlm0 \ + winbind \ + xvfb \ + xauth \ + python3 \ + libncurses5-dev:i386 \ + libncurses6 \ + dbus \ + libgdiplus \ + lib32gcc-s1 \ + netcat-openbsd \ + alsa-tools \ + libpulse-dev \ + libasound2 \ + libao-common \ + gnutls-bin \ + libasound2 \ + locales \ + gnupg \ + numactl -RUN useradd -d /home/container -m container # 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 winehq-stable cabextract wine-binfmt -y +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 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 chmod +x /usr/sbin/winetricks +RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +RUN 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 -ENV USER=container HOME=/home/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 dfb7536..673b3f3 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -1,76 +1,66 @@ -FROM debian:bookworm-slim +FROM debian:bookworm-slim -LABEL author="Torsten Widmann" maintainer="info@goover.de" -LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" -LABEL org.opencontainers.image.licenses=MIT +LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images" +LABEL org.opencontainers.image.licenses=MIT ## install required packages -RUN dpkg --add-architecture i386 -RUN apt update -RUN apt -y upgrade -RUN apt install -y --no-install-recommends \ - alsa-tools \ - dbus \ - gnupg \ - gnupg2 \ - gnutls-bin \ - iproute2 \ - locales \ - netcat-openbsd \ - numactl \ - python3 \ - software-properties-common \ - tini \ - wget \ - winbind \ - xauth \ - xvfb \ - lib32gcc-s1 \ - libao-common \ - libasound2 \ - libasound2 \ - libgdiplus \ - libncurses5-dev:i386 \ - libncurses6 \ - libntlm0 \ - libpulse-dev +RUN dpkg --add-architecture i386 +RUN apt update +RUN apt -y upgrade +RUN apt install -y --no-install-recommends \ + wget \ + iproute2 \ + gnupg2 \ + software-properties-common \ + libntlm0 \ + winbind \ + xvfb \ + xauth \ + python3 \ + libncurses5-dev:i386 \ + libncurses6 \ + dbus \ + libgdiplus \ + lib32gcc-s1 \ + netcat-openbsd \ + alsa-tools \ + libpulse-dev \ + libasound2 \ + libao-common \ + gnutls-bin \ + libasound2 \ + locales \ + gnupg \ + numactl + # 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 winehq-staging cabextract -y +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 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 chmod +x /usr/sbin/winetricks +RUN wget -q -O /usr/sbin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks +RUN 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 - -# Set the locale -RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \ - locale-gen -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 +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 +RUN useradd -m -d /home/container -s /bin/bash container +USER container +ENV USER=container HOME=/home/container +WORKDIR /home/container -## Copy over and execute entrypoint.sh -COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh -ENTRYPOINT ["/usr/bin/tini", "-g", "--"] -CMD ["/entrypoint.sh"] +COPY ./entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"]