From ae5ddd61104d246ecfacac03673466c7b358092b Mon Sep 17 00:00:00 2001
From: Logan McNaughton <logan@bacoosta.com>
Date: Wed, 29 Dec 2021 16:34:59 -0700
Subject: [PATCH] update toolbox

---
 .github/workflows/toolbox.yml |  6 ++++--
 toolbox/Containerfile         | 10 ++++++----
 toolbox/README.md             |  3 +--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/toolbox.yml b/.github/workflows/toolbox.yml
index f99f4a1..02fe044 100644
--- a/.github/workflows/toolbox.yml
+++ b/.github/workflows/toolbox.yml
@@ -12,6 +12,7 @@ env:
   REGISTRY_USER: loganmc10
   IMAGE_REGISTRY: quay.io
   REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+  VERSION: "v2021.12.29"
 
 jobs:
   build-toolbox:
@@ -28,6 +29,7 @@ jobs:
 
       - name: Run podman
         run: |
-          podman build . --tag m64p:latest
-          podman push localhost/m64p:latest quay.io/loganmc10/m64p:latest
+          podman build . --tag quay.io/loganmc10/m64p:latest --tag quay.io/loganmc10/m64p:${{ env.VERSION }}
+          podman push quay.io/loganmc10/m64p:latest
+          podman push quay.io/loganmc10/m64p:${{ env.VERSION }}
         working-directory: toolbox
diff --git a/toolbox/Containerfile b/toolbox/Containerfile
index dd92e87..45b6c85 100644
--- a/toolbox/Containerfile
+++ b/toolbox/Containerfile
@@ -1,7 +1,9 @@
 FROM registry.fedoraproject.org/fedora-toolbox:35
 
-#ADD https://github.com/loganmc10/m64p/releases/download/v2021.12.3/m64p-linux64-2ae80db.zip /
-#RUN unzip /m64p*.zip
-#RUN rm /m64p*.zip
+ADD https://github.com/loganmc10/m64p/releases/download/v2021.12.29/m64p-linux64-7045d7a.zip /
+RUN unzip /m64p*.zip
+RUN rm /m64p*.zip
+RUN dnf -y update
 RUN dnf -y install qt5-qtbase-gui qt5-qtwebsockets SDL2_net minizip-compat hidapi libatomic pipewire
-#RUN ln -s /mupen64plus/mupen64plus-gui /usr/bin/m64p
+RUN ln -s /mupen64plus/mupen64plus-gui /usr/bin/start
+ENV M64P_DISABLE_UPDATER=1
diff --git a/toolbox/README.md b/toolbox/README.md
index 54ed544..214b998 100644
--- a/toolbox/README.md
+++ b/toolbox/README.md
@@ -1,9 +1,8 @@
 On systems without Snap (like Fedora) you can use [toolbox](https://github.com/containers/toolbox) to easily resolve dependencies.
 
-First, download and unzip the latest release (https://github.com/loganmc10/m64p/releases) somewhere in your home directory
 ```
 sudo dnf -y install toolbox
 toolbox create --image quay.io/loganmc10/m64p m64p -y
 
-toolbox run -c m64p ~/path_to/mupen64plus/mupen64plus-gui
+toolbox run -c m64p start
 ```