From 8b3577c21449d31d31381e8e9c3e64407a5fb6c9 Mon Sep 17 00:00:00 2001
From: MisterSheeple <27652712+MisterSheeple@users.noreply.github.com>
Date: Wed, 8 Nov 2023 00:36:48 -0500
Subject: [PATCH] Upgrade Dockerfile to Ubuntu 22.04 as 18.04 is EOL (#491)

* Upgrade Dockerfile to Ubuntu 22.04 as 18.04 is EOL

* Update dependencies to use current ones

* Remove extra package that I don't think is required

* Remove use of old qemu irix

* Update and rename Dockerfile-ci to Dockerfile

* Add docker instructions to README
---
 Dockerfile    | 19 +++++++++++++++++++
 Dockerfile-ci | 22 ----------------------
 README.md     | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 Dockerfile-ci

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..87145871a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:22.04 as build
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        binutils-mips-linux-gnu \
+        build-essential \
+        libaudiofile-dev \
+        libcapstone-dev \
+        git \
+        pkg-config \
+        python3 \
+	wget \
+        zlib1g-dev
+
+RUN mkdir /mk64
+WORKDIR /mk64
+
+CMD echo 'Usage: docker run -it --rm -v ${PWD}:/mk64 mk64 make\n'\
+         'See https://github.com/n64decomp/mk64/blob/master/README.md for more information'
diff --git a/Dockerfile-ci b/Dockerfile-ci
deleted file mode 100644
index c5d31ee1f..000000000
--- a/Dockerfile-ci
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:18.04 as build
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        binutils-mips-linux-gnu \
-        bsdmainutils \
-        build-essential \
-        libcapstone-dev \
-        git \
-        pkgconf \
-        python3 \
-	   wget \
-	   libglib2.0-0
-
-RUN TEMP_DEB="$(mktemp)" && \
-    wget -O "$TEMP_DEB" 'https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb'  && \
-    dpkg -i "$TEMP_DEB" && \
-    rm -f "$TEMP_DEB"
-
-RUN mkdir /opt/assets
-
-COPY roms/ /opt/assets
diff --git a/README.md b/README.md
index e0ae47f97..94b3aad64 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,24 @@ brew install python3 capstone coreutils make pkg-config tehzz/n64-dev/mips64-elf
 
 When building, use `gmake` to ensure that homebrew `make` is used instead of the old, macOS system `make`.
 
+#### Docker
+
+Build the Docker image:
+```
+docker build -t mk64 .
+```
+
+When building and using other tools, append the following in front of every command you run:
+```bash
+docker run --rm -v ${PWD}:/mk64 mk64
+```
+
+For example:
+```bash
+docker run --rm -v ${PWD}:/mk64 mk64 make -C tools
+docker run --rm -v ${PWD}:/mk64 mk64 make
+```
+
 ## Building
 
 Place a US version of Mario Kart 64 called `baserom.us.z64` into the project folder for asset extraction.