Skip to content

Commit 089a9a1

Browse files
committed
fix: update VM snapshot functions to work with mm vm migrate
The minimega `vm migrate` command was recently updated to generate both a memory state file as well as a disk hdd file. This commit updates the relevant phenix functions that are called to generate and restore VM snapshots to use the new files accordingly.
1 parent 4cc6439 commit 089a9a1

File tree

5 files changed

+37
-140
lines changed

5 files changed

+37
-140
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
repository_dispatch:
66
types: [apps-update]
77
env:
8-
MM_REV: e8ce6d1
8+
MM_REV: aecea71
99
jobs:
1010
push-to-ghcr:
1111
name: Push phenix Docker image to GitHub Packages

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Update GitHub workflow config to change the minimum version of minimega
22
# required for use with phenix. This build stage is needed for making sure the
33
# latest version of the minimega Python module is installed.
4-
ARG MM_MIN_REV=e8ce6d1
4+
ARG MM_MIN_REV=aecea71
55
FROM ghcr.io/sandia-minimega/minimega:${MM_MIN_REV} AS minimega
66

77

@@ -175,7 +175,7 @@ COPY --from=gobuilder /phenix/src/go/bin/phenix-tunneler-* /opt/phenix/downloads
175175

176176
# Update GitHub workflow config to change the minimum version of minimega
177177
# required for use with phenix.
178-
ARG MM_MIN_REV=e8ce6d1
178+
ARG MM_MIN_REV=aecea71
179179
LABEL gov.sandia.phenix.minimega-min-revision="ghcr.io/sandia-minimega/minimega:${MM_MIN_REV}"
180180

181181
WORKDIR /opt/phenix

docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
context: ../
1515
dockerfile: docker/Dockerfile
1616
args:
17-
MM_MIN_REV: ${MM_REV:-52875e9}
17+
MM_MIN_REV: ${MM_REV:-aecea71}
1818
PHENIX_WEB_AUTH: disabled
1919
command:
2020
- phenix
@@ -40,7 +40,7 @@ services:
4040
healthcheck:
4141
test: phenix version
4242
minimega:
43-
image: ghcr.io/sandia-minimega/minimega:${MM_REV:-52875e9}
43+
image: ghcr.io/sandia-minimega/minimega:${MM_REV:-aecea71}
4444
container_name: minimega
4545
privileged: true
4646
<<: *common

0 commit comments

Comments
 (0)