966aec464a
When initialising a manifest, use the ostree commit source spec only. Then, when serialising, use the resolved ostree commit. This is the same process we use for the other content types, packages and containers. Two new functions are defined in the distros to handle resolving the ostree options: one for creating the parent commit source spec and image ref for image types that have an optional parent commit (ostree commits and containers) and one for creating the payload commit source spec for image types that require an ostree payload (ostree raw images and installers).
79 lines
2.4 KiB
Go
79 lines
2.4 KiB
Go
package image
|
|
|
|
import (
|
|
"math/rand"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/artifact"
|
|
"github.com/osbuild/osbuild-composer/internal/environment"
|
|
"github.com/osbuild/osbuild-composer/internal/manifest"
|
|
"github.com/osbuild/osbuild-composer/internal/ostree"
|
|
"github.com/osbuild/osbuild-composer/internal/platform"
|
|
"github.com/osbuild/osbuild-composer/internal/rpmmd"
|
|
"github.com/osbuild/osbuild-composer/internal/runner"
|
|
"github.com/osbuild/osbuild-composer/internal/workload"
|
|
)
|
|
|
|
type OSTreeContainer struct {
|
|
Base
|
|
Platform platform.Platform
|
|
OSCustomizations manifest.OSCustomizations
|
|
Environment environment.Environment
|
|
Workload workload.Workload
|
|
|
|
// OSTreeParent specifies the source for an optional parent commit for the
|
|
// new commit being built.
|
|
OSTreeParent *ostree.SourceSpec
|
|
|
|
// OSTreeRef is the ref of the commit that will be built.
|
|
OSTreeRef string
|
|
|
|
OSVersion string
|
|
ExtraContainerPackages rpmmd.PackageSet // FIXME: this is never read
|
|
ContainerLanguage string
|
|
Filename string
|
|
}
|
|
|
|
func NewOSTreeContainer(ref string) *OSTreeContainer {
|
|
return &OSTreeContainer{
|
|
Base: NewBase("ostree-container"),
|
|
OSTreeRef: ref,
|
|
}
|
|
}
|
|
|
|
func (img *OSTreeContainer) InstantiateManifest(m *manifest.Manifest,
|
|
repos []rpmmd.RepoConfig,
|
|
runner runner.Runner,
|
|
rng *rand.Rand) (*artifact.Artifact, error) {
|
|
buildPipeline := manifest.NewBuild(m, runner, repos)
|
|
buildPipeline.Checkpoint()
|
|
|
|
osPipeline := manifest.NewOS(m, buildPipeline, img.Platform, repos)
|
|
osPipeline.OSCustomizations = img.OSCustomizations
|
|
osPipeline.Environment = img.Environment
|
|
osPipeline.Workload = img.Workload
|
|
osPipeline.OSTreeRef = img.OSTreeRef
|
|
osPipeline.OSTreeParent = img.OSTreeParent
|
|
|
|
commitPipeline := manifest.NewOSTreeCommit(m, buildPipeline, osPipeline, img.OSTreeRef)
|
|
commitPipeline.OSVersion = img.OSVersion
|
|
|
|
nginxConfigPath := "/etc/nginx.conf"
|
|
listenPort := "8080"
|
|
|
|
serverPipeline := manifest.NewOSTreeCommitServer(m,
|
|
buildPipeline,
|
|
img.Platform,
|
|
repos,
|
|
commitPipeline,
|
|
nginxConfigPath,
|
|
listenPort)
|
|
serverPipeline.Language = img.ContainerLanguage
|
|
|
|
containerPipeline := manifest.NewOCIContainer(m, buildPipeline, serverPipeline)
|
|
containerPipeline.Cmd = []string{"nginx", "-c", nginxConfigPath}
|
|
containerPipeline.ExposedPorts = []string{listenPort}
|
|
containerPipeline.Filename = img.Filename
|
|
artifact := containerPipeline.Export()
|
|
|
|
return artifact, nil
|
|
}
|