From 174781caa8de3a23b8e4ca194a7a7fb976334b60 Mon Sep 17 00:00:00 2001
From: MisterSheeple <27652712+MisterSheeple@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:25:44 +0000
Subject: [PATCH 1/3] Update Dockerfile to Ubuntu 22.04

also:

- Update packages for Dockerfile and instructions
---
 Dockerfile | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e4f13f6d4..ff7c9d48e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,16 @@
-FROM ubuntu:18.04 as build
+FROM ubuntu:22.04 as build
 
 RUN apt-get update && \
     apt-get install -y \
-        binutils-mips-linux-gnu \
-        bsdmainutils \
         build-essential \
-        libaudiofile-dev \
-        python3 \
-        wget \
         git \
         libglew-dev \
-        libsdl2-dev
+        libsdl2-dev \
+        python3
 
-RUN wget \
-        https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \
-        -O qemu.deb && \
-    echo 8170f37cf03a08cc2d7c1c58f10d650ea0d158f711f6916da9364f6d8c85f741 qemu.deb | sha256sum --check && \
-    dpkg -i qemu.deb && \
-    rm qemu.deb
+RUN mkdir /sm64ex
+WORKDIR /sm64ex
+ENV PATH="/sm64ex/tools:${PATH}"
 
-RUN mkdir /sm64
-WORKDIR /sm64
-ENV PATH="/sm64/tools:${PATH}"
-
-CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \
-         'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'
+CMD echo 'usage: docker run --rm -v ${PWD}:/sm64ex sm64ex make BETTERCAMERA=1 EXTERNAL_DATA=1 -j4\n' \
+         'see https://github.com/sm64pc/sm64ex/wiki/Compiling-on-Docker for advanced usage'

From da7a8b34bd1b94a7a595160a5935cabb3d05d9d6 Mon Sep 17 00:00:00 2001
From: MisterSheeple <27652712+MisterSheeple@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:34:37 +0000
Subject: [PATCH 2/3] Add missing package for hexdump

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index ff7c9d48e..bccdafd06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:22.04 as build
 
 RUN apt-get update && \
     apt-get install -y \
+        bsdextrautils \
         build-essential \
         git \
         libglew-dev \

From ea67b5a3c5ce5537e2bdabe7e60414b678343bf3 Mon Sep 17 00:00:00 2001
From: MisterSheeple <27652712+MisterSheeple@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:45:28 +0000
Subject: [PATCH 3/3] Make usage message consistent

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bccdafd06..587cb06bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,5 +13,5 @@ RUN mkdir /sm64ex
 WORKDIR /sm64ex
 ENV PATH="/sm64ex/tools:${PATH}"
 
-CMD echo 'usage: docker run --rm -v ${PWD}:/sm64ex sm64ex make BETTERCAMERA=1 EXTERNAL_DATA=1 -j4\n' \
-         'see https://github.com/sm64pc/sm64ex/wiki/Compiling-on-Docker for advanced usage'
+CMD echo 'Usage: docker run --rm -v ${PWD}:/sm64ex sm64ex make BETTERCAMERA=1 EXTERNAL_DATA=1 -j4\n' \
+         'See https://github.com/sm64pc/sm64ex/wiki/Compiling-on-Docker for more information'