diff --git a/docker/Dockerfile.minimega b/docker/Dockerfile.minimega index 6f689d6f..3964c10c 100644 --- a/docker/Dockerfile.minimega +++ b/docker/Dockerfile.minimega @@ -3,7 +3,7 @@ ARG MM_REV FROM ghcr.io/activeshadow/minimega/minimega:${MM_REV} -ARG MINIMEGA_REVISION +ARG MM_REV LABEL org.opencontainers.image.base.name="ghcr.io/activeshadow/minimega/minimega:${MM_REV}" ARG PHENIX_REVISION=local-dev LABEL gov.sandia.phenix.revision="${PHENIX_REVISION}" diff --git a/src/go/api/experiment/experiment.go b/src/go/api/experiment/experiment.go index 9a2230a8..03823dfb 100644 --- a/src/go/api/experiment/experiment.go +++ b/src/go/api/experiment/experiment.go @@ -557,7 +557,7 @@ func Start(ctx context.Context, opts ...StartOption) error { // them. This cannot be done as part of the minimega script template since // the VM taps (and thus bridges) do not get created until the overall // minimega namespace is launched. - if exp.Spec.UseGREMesh() || exp.Spec.DefaultBridge() != "phenix" { + if exp.Spec.UseGREMesh() { if err := mm.CreateBridge(mm.NS(exp.Metadata.Name), mm.Bridge(exp.Spec.DefaultBridge())); err != nil { if !o.mmErrAsWarn { mm.ClearNamespace(exp.Spec.ExperimentName())