build: update minimega revision

This pulls in support for using `MM_APPEND` env variable to append arbitrary command line arguments when starting minimega.
sandialabs · Sep 4, 2024 · abf9349 · abf9349
1 parent 0264514
commit abf9349
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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