From f677e7baf46fb88240d6e01f102648688e0e9943 Mon Sep 17 00:00:00 2001
From: gOOvER <116325+gOOvER@users.noreply.github.com>
Date: Sat, 14 Oct 2023 10:45:38 +0200
Subject: [PATCH] Update Dockerfile

---
 games/wurm/Dockerfile | 85 +++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/games/wurm/Dockerfile b/games/wurm/Dockerfile
index fe712ae..c2c08b1 100644
--- a/games/wurm/Dockerfile
+++ b/games/wurm/Dockerfile
@@ -8,71 +8,70 @@ RUN         dpkg --add-architecture i386
 RUN         apt update
 RUN         apt upgrade -y
 RUN         apt install -y \
-                wget \
-                mesa-utils \
-                git \
-                tar \
+                apt-transport-https \
                 curl \
-                gcc \
                 g++ \
-                iproute2 \
+                gcc \
                 gdb \
-                sed \
-                xvfb \
-                python3 \
-                python3-dev \
-                python3-pip \
+                git \
+                iproute2 \
                 jq \
-                telnet \
+                mesa-utils \
                 net-tools \
                 netcat-openbsd \
-                tzdata \
                 psmisc \
+                python3 \
+                python3-dev \
+                python3-pip \
+                sed \
                 sqlite3 \
-                libsdl1.2debian \
-                libfontconfig1 \
+                tar \
+                telnet \
+                tzdata \
+                wget \
+                xvfb \
                 lib32gcc-s1 \
-                libgcc1 \
+                lib32stdc++6 \
                 lib32tinfo6 \
                 lib32z1 \
-                lib32stdc++6 \
-                libstdc++6 \
-                libgdiplus \
-                libcurl4 \
-                libfontconfig1 \
-                libpangocairo-1.0-0 \
-                libnss3 \
-                libgconf-2-4 \
-                libxi6 \
-                libxcursor1 \
-                libxss1 \
-                libxcomposite1 \
                 libasound2 \
-                libxdamage1 \
-                libxtst6 \
                 libatk1.0-0 \
-                libxrandr2 \
+                libc6:i386 \
+                libcurl3-gnutls:i386 \
+                libcurl4 \
                 libcurl4 \
-                libcurl4:i386 \
                 libcurl4-gnutls-dev:i386 \
-                libpulse-dev \
-                #libssl3 \
-                #libssl3:i386 \
-                libtinfo6:i386 \
+                libcurl4:i386 \
+                libfontconfig1 \
+                libfontconfig1 \
+                libgcc1 \
+                libgconf-2-4 \
+                libgdiplus \
                 libncurses5:i386 \
-                libcurl3-gnutls:i386 \
+                libnss3 \
+                libpangocairo-1.0-0 \
+                libpulse-dev \
+                libsdl1.2debian \
                 libsdl2-2.0-0 \
                 libsdl2-2.0-0:i386 \
+                libstdc++6 \
                 libstdc++6:i386 \
-                libc6:i386 \
+                libswt-gtk-4-java \
                 libtcmalloc-minimal4 \
-                libswt-gtk-4-java
+                libtinfo6:i386 \
+                libxcomposite1 \
+                libxcursor1 \
+                libxdamage1 \
+                libxi6 \
+                libxrandr2 \
+                libxss1 \
+                libxtst6
 
-RUN         apt install apt-transport-https ca-certificates wget dirmngr gnupg software-properties-common -y
-RUN         wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add -
-RUN         add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+RUN         mkdir -p /etc/apt/keyrings
+RUN         wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
+RUN         echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 RUN         apt update
-RUN         apt install adoptopenjdk-8-hotspot -y
+RUN         apt install temurin-8-jdk -y
 
 ## Setup user and working directory
 RUN         useradd -m -d /home/container -s /bin/bash container