From abf93496bb9a3d0b1f8fa8c82df72ecdd7b55b90 Mon Sep 17 00:00:00 2001
From: "Bryan T. Richardson" <bryan@activeshadow.com>
Date: Wed, 4 Sep 2024 08:10:01 -0600
Subject: [PATCH] build: update minimega revision

This pulls in support for using `MM_APPEND` env variable to append
arbitrary command line arguments when starting minimega.
---
 .github/workflows/docker.yml   | 2 +-
 .github/workflows/minimega.yml | 4 ++--
 docker/docker-compose.yml      | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7d6d38f9..0031e2a6 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,7 +30,7 @@ jobs:
           context: .
           file: docker/Dockerfile
           build-args: |
-            MM_MIN_REV=c8e20a3
+            MM_MIN_REV=da0b90c
             PHENIX_COMMIT=${{ env.sha }}
             PHENIX_TAG=${{ env.branch }}
             APPS_REPO=github.com/${{ github.event_name == 'repository_dispatch' && github.event.client_payload.repo || 'sandialabs/sceptre-phenix-apps' }}
diff --git a/.github/workflows/minimega.yml b/.github/workflows/minimega.yml
index 845f6172..593eddfc 100644
--- a/.github/workflows/minimega.yml
+++ b/.github/workflows/minimega.yml
@@ -28,10 +28,10 @@ jobs:
           context: docker
           file: docker/Dockerfile.minimega
           build-args: |
-            MM_REV=c8e20a3
+            MM_REV=da0b90c
             PHENIX_REVISION=${{ env.sha }}
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}/minimega:c8e20a3
+            ghcr.io/${{ github.repository }}/minimega:da0b90c
             ghcr.io/${{ github.repository }}/minimega:${{ env.sha }}
             ghcr.io/${{ github.repository }}/minimega:${{ env.branch }}
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ccb09bd5..a264ed0f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -14,8 +14,10 @@ services:
       context: ../
       dockerfile: docker/Dockerfile
       args:
-        MM_MIN_REV: c8e20a3
+        MM_MIN_REV: da0b90c
         PHENIX_WEB_AUTH: disabled
+        APPS_REPO: github.com/activeshadow/phenix-apps
+        APPS_BRANCH: caldera
     command:
     - phenix
     - ui
@@ -44,7 +46,7 @@ services:
       context: .
       dockerfile: Dockerfile.minimega
       args:
-        MM_REV: c8e20a3
+        MM_REV: da0b90c
     image: minimega
     container_name: minimega
     privileged: true